Skip to content
/ rust Public
forked from rust-lang/rust

Commit c5433c3

Browse files
poirupoiru
committedJul 23, 2014
mk: Remove extra whitespace before line continuation backslashes
1 parent b10dcbe commit c5433c3

File tree

10 files changed

+162
-162
lines changed

10 files changed

+162
-162
lines changed
 

‎mk/clean.mk

+24-24
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
6969
$(Q)find $(1)\
70-
-name '*.dSYM' \
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/host.mk

+14-14
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@
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))
2727
$$(call REMOVE_ALL_OLD_GLOB_MATCHES,\
@@ -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/main.mk

+15-15
Original file line numberDiff line numberDiff line change
@@ -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

+15-15
Original file line numberDiff line numberDiff line change
@@ -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=
@@ -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),)

‎mk/prepare.mk

+5-5
Original file line numberDiff line numberDiff line change
@@ -54,11 +54,11 @@ define PREPARE_LIB
5454
$(Q)LIB_NAME="$(notdir $(lastword $(wildcard $(PREPARE_WORKING_SOURCE_LIB_DIR)/$(1))))"; \
5555
MATCHES="$(filter-out %$(notdir $(lastword $(wildcard $(PREPARE_WORKING_SOURCE_LIB_DIR)/$(1)))),\
5656
$(wildcard $(PREPARE_WORKING_DEST_LIB_DIR)/$(1)))"; \
57-
if [ -n "$$MATCHES" ]; then \
58-
echo "warning: one or libraries matching Rust library '$(1)'" && \
59-
echo " (other than '$$LIB_NAME' itself) already present" && \
60-
echo " at destination $(PREPARE_WORKING_DEST_LIB_DIR):" && \
61-
echo $$MATCHES ; \
57+
if [ -n "$$MATCHES" ]; then \
58+
echo "warning: one or libraries matching Rust library '$(1)'" && \
59+
echo " (other than '$$LIB_NAME' itself) already present" && \
60+
echo " at destination $(PREPARE_WORKING_DEST_LIB_DIR):" && \
61+
echo $$MATCHES ; \
6262
fi
6363
$(Q)$(PREPARE_LIB_CMD) `ls -drt1 $(PREPARE_WORKING_SOURCE_LIB_DIR)/$(1) | tail -1` $(PREPARE_WORKING_DEST_LIB_DIR)/
6464
endef

‎mk/rt.mk

+3-3
Original file line numberDiff line numberDiff line change
@@ -114,10 +114,10 @@ $$(RT_OUTPUT_DIR_$(1))/$$(NATIVE_$(2)_$(1)): $$(OBJS_$(2)_$(1))
114114

115115
endef
116116

117-
$(foreach target,$(CFG_TARGET), \
117+
$(foreach target,$(CFG_TARGET), \
118118
$(eval $(call RUNTIME_RULES,$(target))))
119-
$(foreach lib,$(NATIVE_LIBS), \
120-
$(foreach target,$(CFG_TARGET), \
119+
$(foreach lib,$(NATIVE_LIBS), \
120+
$(foreach target,$(CFG_TARGET), \
121121
$(eval $(call THIRD_PARTY_LIB,$(target),$(lib)))))
122122

123123

‎mk/snap.mk

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ snap-stage$(1)-H-$(2): $$(HSREQ$(1)_H_$(2))
1717

1818
endef
1919

20-
$(foreach host,$(CFG_HOST), \
21-
$(eval $(foreach stage,1 2 3, \
20+
$(foreach host,$(CFG_HOST), \
21+
$(eval $(foreach stage,1 2 3, \
2222
$(eval $(call DEF_SNAP_FOR_STAGE_H,$(stage),$(host))))))
2323

2424
snap-stage1: snap-stage1-H-$(CFG_BUILD)

‎mk/stage0.mk

+4-4
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ $(HBIN0_H_$(CFG_BUILD))/:
66
$(HLIB0_H_$(CFG_BUILD))/:
77
mkdir -p $@
88

9-
$(SNAPSHOT_RUSTC_POST_CLEANUP): \
10-
$(S)src/snapshots.txt \
11-
$(S)src/etc/get-snapshot.py $(MKFILE_DEPS) \
9+
$(SNAPSHOT_RUSTC_POST_CLEANUP): \
10+
$(S)src/snapshots.txt \
11+
$(S)src/etc/get-snapshot.py $(MKFILE_DEPS) \
1212
| $(HBIN0_H_$(CFG_BUILD))/
1313

1414
@$(call E, fetch: $@)
@@ -44,5 +44,5 @@ endef
4444

4545
# Use stage1 to build other architectures: then you don't have to wait
4646
# for stage2, but you get the latest updates to the compiler source.
47-
$(foreach t,$(NON_BUILD_HOST), \
47+
$(foreach t,$(NON_BUILD_HOST), \
4848
$(eval $(call BOOTSTRAP_STAGE0,$(t),1,$(CFG_BUILD))))

0 commit comments

Comments
 (0)