Skip to content

Commit 6203f8a

Browse files
borsbors
committed
auto merge of #15922 : poiru/rust/remove-whitespace-mk-backslash, r=brson
The alignment of the line continuation backslashes is rather inconsistent. These commits solve that by removing the extra whitespace and adding a space where there previously was none. An alternative solution would be to fix the alignment.
2 parents 482c776 + 6511053 commit 6203f8a

13 files changed

+232
-232
lines changed

‎mk/clean.mk

+25-25
Original file line numberDiff line numberDiff line change
@@ -12,21 +12,21 @@
1212
# Cleanup
1313
######################################################################
1414

15-
CLEAN_STAGE_RULES := \
16-
$(foreach stage, $(STAGES), \
17-
$(foreach host, $(CFG_HOST), \
18-
clean$(stage)_H_$(host) \
19-
$(foreach target, $(CFG_TARGET), \
15+
CLEAN_STAGE_RULES := \
16+
$(foreach stage, $(STAGES), \
17+
$(foreach host, $(CFG_HOST), \
18+
clean$(stage)_H_$(host) \
19+
$(foreach target, $(CFG_TARGET), \
2020
clean$(stage)_T_$(target)_H_$(host))))
2121

22-
CLEAN_STAGE_RULES := $(CLEAN_STAGE_RULES) \
22+
CLEAN_STAGE_RULES := $(CLEAN_STAGE_RULES) \
2323
$(foreach host, $(CFG_HOST), clean-generic-H-$(host))
2424

25-
CLEAN_STAGE_RULES := $(CLEAN_STAGE_RULES) \
25+
CLEAN_STAGE_RULES := $(CLEAN_STAGE_RULES) \
2626
$(foreach host, $(CFG_TARGET), clean-generic-T-$(host))
2727

28-
CLEAN_LLVM_RULES = \
29-
$(foreach target, $(CFG_HOST), \
28+
CLEAN_LLVM_RULES = \
29+
$(foreach target, $(CFG_HOST), \
3030
clean-llvm$(target))
3131

3232
.PHONY: clean clean-all clean-misc clean-llvm
@@ -54,20 +54,20 @@ clean-generic-$(2)-$(1):
5454
$(1)/rt \
5555
$(1)/test \
5656
$(1)/stage* \
57-
-type f \( \
57+
-type f \( \
5858
-name '*.[odasS]' -o \
59-
-name '*.so' -o \
60-
-name '*.dylib' -o \
61-
-name '*.rlib' -o \
62-
-name 'stamp.*' -o \
63-
-name '*.lib' -o \
64-
-name '*.dll' -o \
65-
-name '*.def' -o \
66-
-name '*.bc' \
67-
\) \
59+
-name '*.so' -o \
60+
-name '*.dylib' -o \
61+
-name '*.rlib' -o \
62+
-name 'stamp.*' -o \
63+
-name '*.lib' -o \
64+
-name '*.dll' -o \
65+
-name '*.def' -o \
66+
-name '*.bc' \
67+
\) \
6868
| xargs rm -f
69-
$(Q)find $(1)\
70-
-name '*.dSYM' \
69+
$(Q)find $(1) \
70+
-name '*.dSYM' \
7171
| xargs rm -Rf
7272
endef
7373

@@ -76,8 +76,8 @@ $(foreach targ, $(CFG_TARGET), $(eval $(call CLEAN_GENERIC,$(targ),T)))
7676

7777
define CLEAN_HOST_STAGE_N
7878

79-
clean$(1)_H_$(2): \
80-
$$(foreach crate,$$(CRATES),clean$(1)_H_$(2)-lib-$$(crate)) \
79+
clean$(1)_H_$(2): \
80+
$$(foreach crate,$$(CRATES),clean$(1)_H_$(2)-lib-$$(crate)) \
8181
$$(foreach tool,$$(TOOLS),clean$(1)_H_$(2)-tool-$$(tool))
8282
$$(Q)rm -fr $(2)/rt/libbacktrace
8383

@@ -96,8 +96,8 @@ $(foreach host, $(CFG_HOST), \
9696

9797
define CLEAN_TARGET_STAGE_N
9898

99-
clean$(1)_T_$(2)_H_$(3): \
100-
$$(foreach crate,$$(CRATES),clean$(1)_T_$(2)_H_$(3)-lib-$$(crate)) \
99+
clean$(1)_T_$(2)_H_$(3): \
100+
$$(foreach crate,$$(CRATES),clean$(1)_T_$(2)_H_$(3)-lib-$$(crate)) \
101101
$$(foreach tool,$$(TOOLS),clean$(1)_T_$(2)_H_$(3)-tool-$$(tool))
102102
$$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/libmorestack.a
103103
$$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/libcompiler-rt.a

‎mk/ctags.mk

+12-12
Original file line numberDiff line numberDiff line change
@@ -18,18 +18,18 @@
1818
# This is using a blacklist approach, probably more durable than a whitelist.
1919
# We exclude: external dependencies (llvm, libuv, gyp, rt/{msvc,sundown,vg}),
2020
# tests (compiletest, test) and a couple of other things (rt/arch, etc)
21-
CTAGS_LOCATIONS=$(patsubst ${CFG_SRC_DIR}src/llvm,,\
22-
$(patsubst ${CFG_SRC_DIR}src/libuv,,\
23-
$(patsubst ${CFG_SRC_DIR}src/compiletest,,\
24-
$(patsubst ${CFG_SRC_DIR}src/test,,\
25-
$(patsubst ${CFG_SRC_DIR}src/gyp,,\
26-
$(patsubst ${CFG_SRC_DIR}src/etc,,\
27-
$(patsubst ${CFG_SRC_DIR}src/rt,,\
28-
$(patsubst ${CFG_SRC_DIR}src/rt/arch,,\
29-
$(patsubst ${CFG_SRC_DIR}src/rt/msvc,,\
30-
$(patsubst ${CFG_SRC_DIR}src/rt/sundown,,\
31-
$(patsubst ${CFG_SRC_DIR}src/rt/vg,,\
32-
$(wildcard ${CFG_SRC_DIR}src/*) $(wildcard ${CFG_SRC_DIR}src/rt/*)\
21+
CTAGS_LOCATIONS=$(patsubst ${CFG_SRC_DIR}src/llvm,, \
22+
$(patsubst ${CFG_SRC_DIR}src/libuv,, \
23+
$(patsubst ${CFG_SRC_DIR}src/compiletest,, \
24+
$(patsubst ${CFG_SRC_DIR}src/test,, \
25+
$(patsubst ${CFG_SRC_DIR}src/gyp,, \
26+
$(patsubst ${CFG_SRC_DIR}src/etc,, \
27+
$(patsubst ${CFG_SRC_DIR}src/rt,, \
28+
$(patsubst ${CFG_SRC_DIR}src/rt/arch,, \
29+
$(patsubst ${CFG_SRC_DIR}src/rt/msvc,, \
30+
$(patsubst ${CFG_SRC_DIR}src/rt/sundown,, \
31+
$(patsubst ${CFG_SRC_DIR}src/rt/vg,, \
32+
$(wildcard ${CFG_SRC_DIR}src/*) $(wildcard ${CFG_SRC_DIR}src/rt/*) \
3333
)))))))))))
3434
CTAGS_OPTS=--options="${CFG_SRC_DIR}src/etc/ctags.rust" --languages=-javascript --recurse ${CTAGS_LOCATIONS}
3535
# We could use `--languages=Rust`, but there is value in producing tags for the

‎mk/docs.mk

+2-2
Original file line numberDiff line numberDiff line change
@@ -112,8 +112,8 @@ HTML_DEPS += doc/version_info.html
112112
doc/version_info.html: $(D)/version_info.html.template $(MKFILE_DEPS) \
113113
$(wildcard $(D)/*.*) | doc/
114114
@$(call E, version-info: $@)
115-
$(Q)sed -e "s/VERSION/$(CFG_RELEASE)/; s/SHORT_HASH/$(\
116-
CFG_SHORT_VER_HASH)/;\
115+
$(Q)sed -e "s/VERSION/$(CFG_RELEASE)/; s/SHORT_HASH/$( \
116+
CFG_SHORT_VER_HASH)/; \
117117
s/STAMP/$(CFG_VER_HASH)/;" $< >$@
118118

119119
GENERATED += doc/version.tex doc/version_info.html

‎mk/host.mk

+16-16
Original file line numberDiff line numberDiff line change
@@ -19,17 +19,17 @@
1919
define CP_HOST_STAGE_N_CRATE
2020

2121
ifeq ($$(ONLY_RLIB_$(5)),)
22-
$$(HLIB$(2)_H_$(4))/stamp.$(5): \
23-
$$(TLIB$(1)_T_$(3)_H_$(4))/stamp.$(5) \
24-
$$(RUST_DEPS_$(5):%=$$(HLIB$(2)_H_$(4))/stamp.%) \
22+
$$(HLIB$(2)_H_$(4))/stamp.$(5): \
23+
$$(TLIB$(1)_T_$(3)_H_$(4))/stamp.$(5) \
24+
$$(RUST_DEPS_$(5):%=$$(HLIB$(2)_H_$(4))/stamp.%) \
2525
| $$(HLIB$(2)_H_$(4))/
2626
@$$(call E, cp: $$(@D)/lib$(5))
27-
$$(call REMOVE_ALL_OLD_GLOB_MATCHES,\
27+
$$(call REMOVE_ALL_OLD_GLOB_MATCHES, \
2828
$$(dir $$@)$$(call CFG_LIB_GLOB_$(3),$(5)))
2929
$$(Q)cp $$< $$@
3030
$$(Q)cp -R $$(TLIB$(1)_T_$(3)_H_$(4))/$$(call CFG_LIB_GLOB_$(3),$(5)) \
3131
$$(HLIB$(2)_H_$(4))
32-
$$(call LIST_ALL_OLD_GLOB_MATCHES,\
32+
$$(call LIST_ALL_OLD_GLOB_MATCHES, \
3333
$$(dir $$@)$$(call CFG_LIB_GLOB_$(3),$(5)))
3434
else
3535
$$(HLIB$(2)_H_$(4))/stamp.$(5):
@@ -66,19 +66,19 @@ endif
6666

6767
endef
6868

69-
$(foreach t,$(CFG_HOST), \
70-
$(eval $(call CP_HOST_STAGE_N,0,1,$(t),$(t))) \
71-
$(eval $(call CP_HOST_STAGE_N,1,2,$(t),$(t))) \
69+
$(foreach t,$(CFG_HOST), \
70+
$(eval $(call CP_HOST_STAGE_N,0,1,$(t),$(t))) \
71+
$(eval $(call CP_HOST_STAGE_N,1,2,$(t),$(t))) \
7272
$(eval $(call CP_HOST_STAGE_N,2,3,$(t),$(t))))
7373

74-
$(foreach crate,$(CRATES), \
75-
$(foreach t,$(CFG_HOST), \
76-
$(eval $(call CP_HOST_STAGE_N_CRATE,0,1,$(t),$(t),$(crate))) \
77-
$(eval $(call CP_HOST_STAGE_N_CRATE,1,2,$(t),$(t),$(crate))) \
74+
$(foreach crate,$(CRATES), \
75+
$(foreach t,$(CFG_HOST), \
76+
$(eval $(call CP_HOST_STAGE_N_CRATE,0,1,$(t),$(t),$(crate))) \
77+
$(eval $(call CP_HOST_STAGE_N_CRATE,1,2,$(t),$(t),$(crate))) \
7878
$(eval $(call CP_HOST_STAGE_N_CRATE,2,3,$(t),$(t),$(crate)))))
7979

80-
$(foreach tool,$(TOOLS), \
81-
$(foreach t,$(CFG_HOST), \
82-
$(eval $(call CP_HOST_STAGE_N_TOOL,0,1,$(t),$(t),$(tool))) \
83-
$(eval $(call CP_HOST_STAGE_N_TOOL,1,2,$(t),$(t),$(tool))) \
80+
$(foreach tool,$(TOOLS), \
81+
$(foreach t,$(CFG_HOST), \
82+
$(eval $(call CP_HOST_STAGE_N_TOOL,0,1,$(t),$(t),$(tool))) \
83+
$(eval $(call CP_HOST_STAGE_N_TOOL,1,2,$(t),$(t),$(tool))) \
8484
$(eval $(call CP_HOST_STAGE_N_TOOL,2,3,$(t),$(t),$(tool)))))

‎mk/install.mk

+3-3
Original file line numberDiff line numberDiff line change
@@ -81,15 +81,15 @@ endif
8181
define INSTALL_RUNTIME_TARGET_N
8282
install-runtime-target-$(1)-host-$(2): $$(TSREQ$$(ISTAGE)_T_$(1)_H_$(2)) $$(SREQ$$(ISTAGE)_T_$(1)_H_$(2))
8383
$$(Q)$$(call ADB_SHELL,mkdir,$(CFG_RUNTIME_PUSH_DIR))
84-
$$(Q)$$(foreach crate,$$(TARGET_CRATES),\
85-
$$(call ADB_PUSH,$$(TL$(1)$(2))/$$(call CFG_LIB_GLOB_$(1),$$(crate)),\
84+
$$(Q)$$(foreach crate,$$(TARGET_CRATES), \
85+
$$(call ADB_PUSH,$$(TL$(1)$(2))/$$(call CFG_LIB_GLOB_$(1),$$(crate)), \
8686
$$(CFG_RUNTIME_PUSH_DIR));)
8787
endef
8888

8989
define INSTALL_RUNTIME_TARGET_CLEANUP_N
9090
install-runtime-target-$(1)-cleanup:
9191
$$(Q)$$(call ADB,remount)
92-
$$(Q)$$(foreach crate,$$(TARGET_CRATES),\
92+
$$(Q)$$(foreach crate,$$(TARGET_CRATES), \
9393
$$(call ADB_SHELL,rm,$$(CFG_RUNTIME_PUSH_DIR)/$$(call CFG_LIB_GLOB_$(1),$$(crate)));)
9494
endef
9595

‎mk/main.mk

+17-17
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ endif
167167
define DEF_X
168168
X_$(1) := $(CFG_EXE_SUFFIX_$(1))
169169
endef
170-
$(foreach target,$(CFG_TARGET),\
170+
$(foreach target,$(CFG_TARGET), \
171171
$(eval $(call DEF_X,$(target))))
172172

173173
# "Source" files we generate in builddir along the way.
@@ -333,7 +333,7 @@ TSREQ$(1)_T_$(2)_H_$(3) = \
333333
# target
334334
SREQ$(1)_T_$(2)_H_$(3) = \
335335
$$(TSREQ$(1)_T_$(2)_H_$(3)) \
336-
$$(foreach dep,$$(TARGET_CRATES),\
336+
$$(foreach dep,$$(TARGET_CRATES), \
337337
$$(TLIB$(1)_T_$(2)_H_$(3))/stamp.$$(dep))
338338

339339
# Prerequisites for a working stageN compiler and complete set of target
@@ -416,20 +416,20 @@ RPATH_VAR$(1)_T_$(2)_H_$(3) := $$(TARGET_RPATH_VAR$(1)_T_$(2)_H_$(3))
416416
endif
417417
endif
418418

419-
STAGE$(1)_T_$(2)_H_$(3) := \
420-
$$(Q)$$(RPATH_VAR$(1)_T_$(2)_H_$(3)) \
421-
$$(call CFG_RUN_TARG_$(3),$(1), \
422-
$$(CFG_VALGRIND_COMPILE$(1)) \
423-
$$(HBIN$(1)_H_$(3))/rustc$$(X_$(3)) \
424-
--cfg $$(CFGFLAG$(1)_T_$(2)_H_$(3)) \
419+
STAGE$(1)_T_$(2)_H_$(3) := \
420+
$$(Q)$$(RPATH_VAR$(1)_T_$(2)_H_$(3)) \
421+
$$(call CFG_RUN_TARG_$(3),$(1), \
422+
$$(CFG_VALGRIND_COMPILE$(1)) \
423+
$$(HBIN$(1)_H_$(3))/rustc$$(X_$(3)) \
424+
--cfg $$(CFGFLAG$(1)_T_$(2)_H_$(3)) \
425425
$$(CFG_RUSTC_FLAGS) $$(EXTRAFLAGS_STAGE$(1)) --target=$(2)) \
426426
$$(RUSTC_FLAGS_$(2))
427427

428-
PERF_STAGE$(1)_T_$(2)_H_$(3) := \
429-
$$(Q)$$(call CFG_RUN_TARG_$(3),$(1), \
430-
$$(CFG_PERF_TOOL) \
431-
$$(HBIN$(1)_H_$(3))/rustc$$(X_$(3)) \
432-
--cfg $$(CFGFLAG$(1)_T_$(2)_H_$(3)) \
428+
PERF_STAGE$(1)_T_$(2)_H_$(3) := \
429+
$$(Q)$$(call CFG_RUN_TARG_$(3),$(1), \
430+
$$(CFG_PERF_TOOL) \
431+
$$(HBIN$(1)_H_$(3))/rustc$$(X_$(3)) \
432+
--cfg $$(CFGFLAG$(1)_T_$(2)_H_$(3)) \
433433
$$(CFG_RUSTC_FLAGS) $$(EXTRAFLAGS_STAGE$(1)) --target=$(2)) \
434434
$$(RUSTC_FLAGS_$(2))
435435

@@ -455,13 +455,13 @@ define DEF_RUSTC_STAGE_TARGET
455455
# $(1) == architecture
456456
# $(2) == stage
457457

458-
rustc-stage$(2)-H-$(1): \
458+
rustc-stage$(2)-H-$(1): \
459459
$$(foreach target,$$(CFG_TARGET),$$(SREQ$(2)_T_$$(target)_H_$(1)))
460460

461461
endef
462462

463-
$(foreach host,$(CFG_HOST), \
464-
$(eval $(foreach stage,1 2 3, \
463+
$(foreach host,$(CFG_HOST), \
464+
$(eval $(foreach stage,1 2 3, \
465465
$(eval $(call DEF_RUSTC_STAGE_TARGET,$(host),$(stage))))))
466466

467467
rustc-stage1: rustc-stage1-H-$(CFG_BUILD)
@@ -474,7 +474,7 @@ define DEF_RUSTC_TARGET
474474
rustc-H-$(1): rustc-stage2-H-$(1)
475475
endef
476476

477-
$(foreach host,$(CFG_TARGET), \
477+
$(foreach host,$(CFG_TARGET), \
478478
$(eval $(call DEF_RUSTC_TARGET,$(host))))
479479

480480
rustc-stage1: rustc-stage1-H-$(CFG_BUILD)

‎mk/platform.mk

+20-20
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ $(foreach t,$(CFG_TARGET),$(info cfg: os for $(t) is $(OSTYPE_$(t))))
3232
CFG_DSYMUTIL := true
3333

3434
# Hack: not sure how to test if a file exists in make other than this
35-
OS_SUPP = $(patsubst %,--suppressions=%,\
35+
OS_SUPP = $(patsubst %,--suppressions=%, \
3636
$(wildcard $(CFG_SRC_DIR)src/etc/$(CFG_OSTYPE).supp*))
3737

3838
ifdef CFG_DISABLE_OPTIMIZE_CXX
@@ -67,7 +67,7 @@ ifneq ($(findstring linux,$(CFG_OSTYPE)),)
6767
endif
6868
else
6969
ifdef CFG_VALGRIND
70-
CFG_PERF_TOOL :=\
70+
CFG_PERF_TOOL := \
7171
$(CFG_VALGRIND) --tool=cachegrind --cache-sim=yes --branch-sim=yes
7272
else
7373
CFG_PERF_TOOL := /usr/bin/time --verbose
@@ -94,7 +94,7 @@ define SET_FROM_CFG
9494
endif
9595
endef
9696

97-
$(foreach cvar,CC CXX CPP CFLAGS CXXFLAGS CPPFLAGS,\
97+
$(foreach cvar,CC CXX CPP CFLAGS CXXFLAGS CPPFLAGS, \
9898
$(eval $(call SET_FROM_CFG,$(cvar))))
9999

100100
CFG_RLIB_GLOB=lib$(1)-*.rlib
@@ -486,8 +486,8 @@ CFG_LIBUV_LINK_FLAGS_i586-mingw32msvc := -L$(CFG_MINGW32_CROSS_PATH)/i586-mingw3
486486
CFG_EXE_SUFFIX_i586-mingw32msvc := .exe
487487
CFG_WINDOWSY_i586-mingw32msvc := 1
488488
CFG_UNIXY_i586-mingw32msvc :=
489-
CFG_PATH_MUNGE_i586-mingw32msvc := $(strip perl -i.bak -p \
490-
-e 's@\\(\S)@/\1@go;' \
489+
CFG_PATH_MUNGE_i586-mingw32msvc := $(strip perl -i.bak -p \
490+
-e 's@\\(\S)@/\1@go;' \
491491
-e 's@^/([a-zA-Z])/@\1:/@o;')
492492
CFG_LDPATH_i586-mingw32msvc :=
493493
CFG_RUN_i586-mingw32msvc=
@@ -591,7 +591,7 @@ define FILTER_FLAGS
591591
endif
592592
endef
593593

594-
$(foreach target,$(CFG_TARGET),\
594+
$(foreach target,$(CFG_TARGET), \
595595
$(eval $(call FILTER_FLAGS,$(target))))
596596

597597

@@ -620,27 +620,27 @@ define CFG_MAKE_TOOLCHAIN
620620
RUSTC_FLAGS_$(1)=$$(RUSTC_CROSS_FLAGS_$(1)) $(RUSTC_FLAGS_$(1))
621621
endif
622622

623-
CFG_COMPILE_C_$(1) = $$(CC_$(1)) \
624-
$$(CFG_GCCISH_CFLAGS) \
623+
CFG_COMPILE_C_$(1) = $$(CC_$(1)) \
624+
$$(CFG_GCCISH_CFLAGS) \
625625
$$(CFG_GCCISH_CFLAGS_$(1)) \
626-
$$(CFG_DEPEND_FLAGS) \
626+
$$(CFG_DEPEND_FLAGS) \
627627
-c -o $$(1) $$(2)
628628
CFG_LINK_C_$(1) = $$(CC_$(1)) \
629-
$$(CFG_GCCISH_LINK_FLAGS) -o $$(1) \
630-
$$(CFG_GCCISH_LINK_FLAGS_$(1)) \
631-
$$(CFG_GCCISH_DEF_FLAG_$(1))$$(3) $$(2) \
629+
$$(CFG_GCCISH_LINK_FLAGS) -o $$(1) \
630+
$$(CFG_GCCISH_LINK_FLAGS_$(1)) \
631+
$$(CFG_GCCISH_DEF_FLAG_$(1))$$(3) $$(2) \
632632
$$(call CFG_INSTALL_NAME_$(1),$$(4))
633633
CFG_COMPILE_CXX_$(1) = $$(CXX_$(1)) \
634-
$$(CFG_GCCISH_CFLAGS) \
635-
$$(CFG_GCCISH_CXXFLAGS) \
634+
$$(CFG_GCCISH_CFLAGS) \
635+
$$(CFG_GCCISH_CXXFLAGS) \
636636
$$(CFG_GCCISH_CFLAGS_$(1)) \
637-
$$(CFG_GCCISH_CXXFLAGS_$(1)) \
638-
$$(CFG_DEPEND_FLAGS) \
637+
$$(CFG_GCCISH_CXXFLAGS_$(1)) \
638+
$$(CFG_DEPEND_FLAGS) \
639639
-c -o $$(1) $$(2)
640640
CFG_LINK_CXX_$(1) = $$(CXX_$(1)) \
641-
$$(CFG_GCCISH_LINK_FLAGS) -o $$(1) \
642-
$$(CFG_GCCISH_LINK_FLAGS_$(1)) \
643-
$$(CFG_GCCISH_DEF_FLAG_$(1))$$(3) $$(2) \
641+
$$(CFG_GCCISH_LINK_FLAGS) -o $$(1) \
642+
$$(CFG_GCCISH_LINK_FLAGS_$(1)) \
643+
$$(CFG_GCCISH_DEF_FLAG_$(1))$$(3) $$(2) \
644644
$$(call CFG_INSTALL_NAME_$(1),$$(4))
645645

646646
ifeq ($$(findstring $(HOST_$(1)),arm mips mipsel),)
@@ -664,5 +664,5 @@ define CFG_MAKE_TOOLCHAIN
664664

665665
endef
666666

667-
$(foreach target,$(CFG_TARGET),\
667+
$(foreach target,$(CFG_TARGET), \
668668
$(eval $(call CFG_MAKE_TOOLCHAIN,$(target))))

0 commit comments

Comments
 (0)