mk: Remove extra whitespace before line continuation backslashes

Author: poiru

mk/clean.mk

@@ -12,21 +12,21 @@
 # Cleanup
 ######################################################################
 
-CLEAN_STAGE_RULES :=							\
- $(foreach stage, $(STAGES),						\
-  $(foreach host, $(CFG_HOST),						\
-   clean$(stage)_H_$(host)						\
-   $(foreach target, $(CFG_TARGET),					\
+CLEAN_STAGE_RULES := \
+ $(foreach stage, $(STAGES), \
+  $(foreach host, $(CFG_HOST), \
+   clean$(stage)_H_$(host) \
+   $(foreach target, $(CFG_TARGET), \
     clean$(stage)_T_$(target)_H_$(host))))
 
-CLEAN_STAGE_RULES := $(CLEAN_STAGE_RULES)				\
+CLEAN_STAGE_RULES := $(CLEAN_STAGE_RULES) \
     $(foreach host, $(CFG_HOST), clean-generic-H-$(host))
 
-CLEAN_STAGE_RULES := $(CLEAN_STAGE_RULES)				\
+CLEAN_STAGE_RULES := $(CLEAN_STAGE_RULES) \
     $(foreach host, $(CFG_TARGET), clean-generic-T-$(host))
 
-CLEAN_LLVM_RULES = 								\
- $(foreach target, $(CFG_HOST),		\
+CLEAN_LLVM_RULES = \
+ $(foreach target, $(CFG_HOST), \
   clean-llvm$(target))
 
 .PHONY: clean clean-all clean-misc clean-llvm
@@ -54,20 +54,20 @@ clean-generic-$(2)-$(1):
 	         $(1)/rt \
 		 $(1)/test \
 		 $(1)/stage* \
-		 -type f \(           \
+		 -type f \( \
          -name '*.[odasS]' -o \
-         -name '*.so' -o      \
-         -name '*.dylib' -o   \
-         -name '*.rlib' -o   \
-         -name 'stamp.*' -o   \
-         -name '*.lib' -o     \
-         -name '*.dll' -o     \
-         -name '*.def' -o     \
-         -name '*.bc'         \
-         \)                   \
+         -name '*.so' -o \
+         -name '*.dylib' -o \
+         -name '*.rlib' -o \
+         -name 'stamp.*' -o \
+         -name '*.lib' -o \
+         -name '*.dll' -o \
+         -name '*.def' -o \
+         -name '*.bc' \
+         \) \
          | xargs rm -f
 	$(Q)find $(1)\
-         -name '*.dSYM'       \
+         -name '*.dSYM' \
          | xargs rm -Rf
 endef
 
@@ -76,8 +76,8 @@ $(foreach targ, $(CFG_TARGET), $(eval $(call CLEAN_GENERIC,$(targ),T)))
 
 define CLEAN_HOST_STAGE_N
 
-clean$(1)_H_$(2):							    \
-	    $$(foreach crate,$$(CRATES),clean$(1)_H_$(2)-lib-$$(crate))	    \
+clean$(1)_H_$(2): \
+	    $$(foreach crate,$$(CRATES),clean$(1)_H_$(2)-lib-$$(crate)) \
 	    $$(foreach tool,$$(TOOLS),clean$(1)_H_$(2)-tool-$$(tool))
 	$$(Q)rm -fr $(2)/rt/libbacktrace
 
@@ -96,8 +96,8 @@ $(foreach host, $(CFG_HOST), \
 
 define CLEAN_TARGET_STAGE_N
 
-clean$(1)_T_$(2)_H_$(3):						       \
-	    $$(foreach crate,$$(CRATES),clean$(1)_T_$(2)_H_$(3)-lib-$$(crate))  \
+clean$(1)_T_$(2)_H_$(3): \
+	    $$(foreach crate,$$(CRATES),clean$(1)_T_$(2)_H_$(3)-lib-$$(crate)) \
 	    $$(foreach tool,$$(TOOLS),clean$(1)_T_$(2)_H_$(3)-tool-$$(tool))
 	$$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/libmorestack.a
 	$$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/libcompiler-rt.a

mk/host.mk

@@ -19,9 +19,9 @@
 define CP_HOST_STAGE_N_CRATE
 
 ifeq ($$(ONLY_RLIB_$(5)),)
-$$(HLIB$(2)_H_$(4))/stamp.$(5):					\
-	$$(TLIB$(1)_T_$(3)_H_$(4))/stamp.$(5)			\
-	$$(RUST_DEPS_$(5):%=$$(HLIB$(2)_H_$(4))/stamp.%)	\
+$$(HLIB$(2)_H_$(4))/stamp.$(5): \
+	$$(TLIB$(1)_T_$(3)_H_$(4))/stamp.$(5) \
+	$$(RUST_DEPS_$(5):%=$$(HLIB$(2)_H_$(4))/stamp.%) \
 	| $$(HLIB$(2)_H_$(4))/
 	@$$(call E, cp: $$(@D)/lib$(5))
 	$$(call REMOVE_ALL_OLD_GLOB_MATCHES,\
@@ -66,19 +66,19 @@ endif
 
 endef
 
-$(foreach t,$(CFG_HOST),						    \
-	$(eval $(call CP_HOST_STAGE_N,0,1,$(t),$(t)))			    \
-	$(eval $(call CP_HOST_STAGE_N,1,2,$(t),$(t)))			    \
+$(foreach t,$(CFG_HOST), \
+	$(eval $(call CP_HOST_STAGE_N,0,1,$(t),$(t))) \
+	$(eval $(call CP_HOST_STAGE_N,1,2,$(t),$(t))) \
 	$(eval $(call CP_HOST_STAGE_N,2,3,$(t),$(t))))
 
-$(foreach crate,$(CRATES),						    \
- $(foreach t,$(CFG_HOST),						    \
-  $(eval $(call CP_HOST_STAGE_N_CRATE,0,1,$(t),$(t),$(crate)))		    \
-  $(eval $(call CP_HOST_STAGE_N_CRATE,1,2,$(t),$(t),$(crate)))		    \
+$(foreach crate,$(CRATES), \
+ $(foreach t,$(CFG_HOST), \
+  $(eval $(call CP_HOST_STAGE_N_CRATE,0,1,$(t),$(t),$(crate))) \
+  $(eval $(call CP_HOST_STAGE_N_CRATE,1,2,$(t),$(t),$(crate))) \
   $(eval $(call CP_HOST_STAGE_N_CRATE,2,3,$(t),$(t),$(crate)))))
 
-$(foreach tool,$(TOOLS),						    \
- $(foreach t,$(CFG_HOST),						    \
-  $(eval $(call CP_HOST_STAGE_N_TOOL,0,1,$(t),$(t),$(tool)))		    \
-  $(eval $(call CP_HOST_STAGE_N_TOOL,1,2,$(t),$(t),$(tool)))		    \
+$(foreach tool,$(TOOLS), \
+ $(foreach t,$(CFG_HOST), \
+  $(eval $(call CP_HOST_STAGE_N_TOOL,0,1,$(t),$(t),$(tool))) \
+  $(eval $(call CP_HOST_STAGE_N_TOOL,1,2,$(t),$(t),$(tool))) \
   $(eval $(call CP_HOST_STAGE_N_TOOL,2,3,$(t),$(t),$(tool)))))

mk/main.mk

@@ -416,20 +416,20 @@ RPATH_VAR$(1)_T_$(2)_H_$(3) := $$(TARGET_RPATH_VAR$(1)_T_$(2)_H_$(3))
 endif
 endif
 
-STAGE$(1)_T_$(2)_H_$(3) := 						\
-	$$(Q)$$(RPATH_VAR$(1)_T_$(2)_H_$(3))                            \
-		$$(call CFG_RUN_TARG_$(3),$(1),				\
-		$$(CFG_VALGRIND_COMPILE$(1))				\
-		$$(HBIN$(1)_H_$(3))/rustc$$(X_$(3))			\
-		--cfg $$(CFGFLAG$(1)_T_$(2)_H_$(3))			\
+STAGE$(1)_T_$(2)_H_$(3) := \
+	$$(Q)$$(RPATH_VAR$(1)_T_$(2)_H_$(3)) \
+		$$(call CFG_RUN_TARG_$(3),$(1), \
+		$$(CFG_VALGRIND_COMPILE$(1)) \
+		$$(HBIN$(1)_H_$(3))/rustc$$(X_$(3)) \
+		--cfg $$(CFGFLAG$(1)_T_$(2)_H_$(3)) \
 		$$(CFG_RUSTC_FLAGS) $$(EXTRAFLAGS_STAGE$(1)) --target=$(2)) \
                 $$(RUSTC_FLAGS_$(2))
 
-PERF_STAGE$(1)_T_$(2)_H_$(3) :=						\
-	$$(Q)$$(call CFG_RUN_TARG_$(3),$(1),				\
-		$$(CFG_PERF_TOOL) 					\
-		$$(HBIN$(1)_H_$(3))/rustc$$(X_$(3))			\
-		--cfg $$(CFGFLAG$(1)_T_$(2)_H_$(3))			\
+PERF_STAGE$(1)_T_$(2)_H_$(3) := \
+	$$(Q)$$(call CFG_RUN_TARG_$(3),$(1), \
+		$$(CFG_PERF_TOOL) \
+		$$(HBIN$(1)_H_$(3))/rustc$$(X_$(3)) \
+		--cfg $$(CFGFLAG$(1)_T_$(2)_H_$(3)) \
 		$$(CFG_RUSTC_FLAGS) $$(EXTRAFLAGS_STAGE$(1)) --target=$(2)) \
                 $$(RUSTC_FLAGS_$(2))
 
@@ -455,13 +455,13 @@ define DEF_RUSTC_STAGE_TARGET
 # $(1) == architecture
 # $(2) == stage
 
-rustc-stage$(2)-H-$(1):							\
+rustc-stage$(2)-H-$(1): \
 	$$(foreach target,$$(CFG_TARGET),$$(SREQ$(2)_T_$$(target)_H_$(1)))
 
 endef
 
-$(foreach host,$(CFG_HOST),						\
- $(eval $(foreach stage,1 2 3,						\
+$(foreach host,$(CFG_HOST), \
+ $(eval $(foreach stage,1 2 3, \
   $(eval $(call DEF_RUSTC_STAGE_TARGET,$(host),$(stage))))))
 
 rustc-stage1: rustc-stage1-H-$(CFG_BUILD)
@@ -474,7 +474,7 @@ define DEF_RUSTC_TARGET
 rustc-H-$(1): rustc-stage2-H-$(1)
 endef
 
-$(foreach host,$(CFG_TARGET),			\
+$(foreach host,$(CFG_TARGET), \
  $(eval $(call DEF_RUSTC_TARGET,$(host))))
 
 rustc-stage1: rustc-stage1-H-$(CFG_BUILD)

mk/platform.mk

@@ -486,8 +486,8 @@ CFG_LIBUV_LINK_FLAGS_i586-mingw32msvc := -L$(CFG_MINGW32_CROSS_PATH)/i586-mingw3
 CFG_EXE_SUFFIX_i586-mingw32msvc := .exe
 CFG_WINDOWSY_i586-mingw32msvc := 1
 CFG_UNIXY_i586-mingw32msvc :=
-CFG_PATH_MUNGE_i586-mingw32msvc := $(strip perl -i.bak -p   \
-                             -e 's@\\(\S)@/\1@go;'       \
+CFG_PATH_MUNGE_i586-mingw32msvc := $(strip perl -i.bak -p \
+                             -e 's@\\(\S)@/\1@go;' \
                              -e 's@^/([a-zA-Z])/@\1:/@o;')
 CFG_LDPATH_i586-mingw32msvc :=
 CFG_RUN_i586-mingw32msvc=
@@ -620,27 +620,27 @@ define CFG_MAKE_TOOLCHAIN
 	RUSTC_FLAGS_$(1)=$$(RUSTC_CROSS_FLAGS_$(1)) $(RUSTC_FLAGS_$(1))
   endif
 
-  CFG_COMPILE_C_$(1) = $$(CC_$(1))  \
-        $$(CFG_GCCISH_CFLAGS)      \
+  CFG_COMPILE_C_$(1) = $$(CC_$(1)) \
+        $$(CFG_GCCISH_CFLAGS) \
         $$(CFG_GCCISH_CFLAGS_$(1)) \
-        $$(CFG_DEPEND_FLAGS)       \
+        $$(CFG_DEPEND_FLAGS) \
         -c -o $$(1) $$(2)
   CFG_LINK_C_$(1) = $$(CC_$(1)) \
-        $$(CFG_GCCISH_LINK_FLAGS) -o $$(1)          \
-        $$(CFG_GCCISH_LINK_FLAGS_$(1))              \
-        $$(CFG_GCCISH_DEF_FLAG_$(1))$$(3) $$(2)     \
+        $$(CFG_GCCISH_LINK_FLAGS) -o $$(1) \
+        $$(CFG_GCCISH_LINK_FLAGS_$(1)) \
+        $$(CFG_GCCISH_DEF_FLAG_$(1))$$(3) $$(2) \
         $$(call CFG_INSTALL_NAME_$(1),$$(4))
   CFG_COMPILE_CXX_$(1) = $$(CXX_$(1)) \
-        $$(CFG_GCCISH_CFLAGS)      \
-        $$(CFG_GCCISH_CXXFLAGS)    \
+        $$(CFG_GCCISH_CFLAGS) \
+        $$(CFG_GCCISH_CXXFLAGS) \
         $$(CFG_GCCISH_CFLAGS_$(1)) \
-        $$(CFG_GCCISH_CXXFLAGS_$(1))    \
-        $$(CFG_DEPEND_FLAGS)       \
+        $$(CFG_GCCISH_CXXFLAGS_$(1)) \
+        $$(CFG_DEPEND_FLAGS) \
         -c -o $$(1) $$(2)
   CFG_LINK_CXX_$(1) = $$(CXX_$(1)) \
-        $$(CFG_GCCISH_LINK_FLAGS) -o $$(1)             \
-        $$(CFG_GCCISH_LINK_FLAGS_$(1))                 \
-        $$(CFG_GCCISH_DEF_FLAG_$(1))$$(3) $$(2)        \
+        $$(CFG_GCCISH_LINK_FLAGS) -o $$(1) \
+        $$(CFG_GCCISH_LINK_FLAGS_$(1)) \
+        $$(CFG_GCCISH_DEF_FLAG_$(1))$$(3) $$(2) \
         $$(call CFG_INSTALL_NAME_$(1),$$(4))
 
   ifeq ($$(findstring $(HOST_$(1)),arm mips mipsel),)

mk/prepare.mk

@@ -54,11 +54,11 @@ define PREPARE_LIB
 	$(Q)LIB_NAME="$(notdir $(lastword $(wildcard $(PREPARE_WORKING_SOURCE_LIB_DIR)/$(1))))"; \
 	MATCHES="$(filter-out %$(notdir $(lastword $(wildcard $(PREPARE_WORKING_SOURCE_LIB_DIR)/$(1)))),\
                         $(wildcard $(PREPARE_WORKING_DEST_LIB_DIR)/$(1)))"; \
-	if [ -n "$$MATCHES" ]; then                                              \
-	  echo "warning: one or libraries matching Rust library '$(1)'" &&       \
-	  echo "  (other than '$$LIB_NAME' itself) already present"     &&       \
-	  echo "  at destination $(PREPARE_WORKING_DEST_LIB_DIR):"                    &&       \
-	  echo $$MATCHES ;                                                       \
+	if [ -n "$$MATCHES" ]; then \
+	  echo "warning: one or libraries matching Rust library '$(1)'" && \
+	  echo "  (other than '$$LIB_NAME' itself) already present"     && \
+	  echo "  at destination $(PREPARE_WORKING_DEST_LIB_DIR):"      && \
+	  echo $$MATCHES ; \
 	fi
 	$(Q)$(PREPARE_LIB_CMD) `ls -drt1 $(PREPARE_WORKING_SOURCE_LIB_DIR)/$(1) | tail -1` $(PREPARE_WORKING_DEST_LIB_DIR)/
 endef

mk/rt.mk

@@ -114,10 +114,10 @@ $$(RT_OUTPUT_DIR_$(1))/$$(NATIVE_$(2)_$(1)): $$(OBJS_$(2)_$(1))
 
 endef
 
-$(foreach target,$(CFG_TARGET),					    \
+$(foreach target,$(CFG_TARGET), \
  $(eval $(call RUNTIME_RULES,$(target))))
-$(foreach lib,$(NATIVE_LIBS),					    \
- $(foreach target,$(CFG_TARGET),				    \
+$(foreach lib,$(NATIVE_LIBS), \
+ $(foreach target,$(CFG_TARGET), \
   $(eval $(call THIRD_PARTY_LIB,$(target),$(lib)))))
 
 

mk/snap.mk

@@ -17,8 +17,8 @@ snap-stage$(1)-H-$(2): $$(HSREQ$(1)_H_$(2))
 
 endef
 
-$(foreach host,$(CFG_HOST),						\
- $(eval $(foreach stage,1 2 3,								\
+$(foreach host,$(CFG_HOST), \
+ $(eval $(foreach stage,1 2 3, \
   $(eval $(call DEF_SNAP_FOR_STAGE_H,$(stage),$(host))))))
 
 snap-stage1: snap-stage1-H-$(CFG_BUILD)

mk/stage0.mk

@@ -6,9 +6,9 @@ $(HBIN0_H_$(CFG_BUILD))/:
 $(HLIB0_H_$(CFG_BUILD))/:
 	mkdir -p $@
 
-$(SNAPSHOT_RUSTC_POST_CLEANUP):						\
-		$(S)src/snapshots.txt					\
-		$(S)src/etc/get-snapshot.py $(MKFILE_DEPS)		\
+$(SNAPSHOT_RUSTC_POST_CLEANUP): \
+		$(S)src/snapshots.txt \
+		$(S)src/etc/get-snapshot.py $(MKFILE_DEPS) \
 		| $(HBIN0_H_$(CFG_BUILD))/
 
 	@$(call E, fetch: $@)
@@ -44,5 +44,5 @@ endef
 
 # Use stage1 to build other architectures: then you don't have to wait
 # for stage2, but you get the latest updates to the compiler source.
-$(foreach t,$(NON_BUILD_HOST),								\
+$(foreach t,$(NON_BUILD_HOST), \
  $(eval $(call BOOTSTRAP_STAGE0,$(t),1,$(CFG_BUILD))))