mk: Add space before line continuation backslash

2024-09-05 08:37:14 +00:00 · 2014-07-22 21:45:08 -07:00 · 2014-07-22 21:45:08 -07:00 · 6511053d1c
parent c5433c3a0f
commit 6511053d1c
10 changed files with 70 additions and 70 deletions
--- a/mk/clean.mk
+++ b/mk/clean.mk
@ -66,7 +66,7 @@ clean-generic-$(2)-$(1):
         -name '*.bc' \
         \) \
         | xargs rm -f
-	$(Q)find $(1)\
+	$(Q)find $(1) \
         -name '*.dSYM' \
         | xargs rm -Rf
 endef
--- a/mk/ctags.mk
+++ b/mk/ctags.mk
@ -18,18 +18,18 @@
 # This is using a blacklist approach, probably more durable than a whitelist.
 # We exclude: external dependencies (llvm, libuv, gyp, rt/{msvc,sundown,vg}),
 # tests (compiletest, test) and a couple of other things (rt/arch, etc)
-CTAGS_LOCATIONS=$(patsubst ${CFG_SRC_DIR}src/llvm,,\
-				$(patsubst ${CFG_SRC_DIR}src/libuv,,\
-				$(patsubst ${CFG_SRC_DIR}src/compiletest,,\
-				$(patsubst ${CFG_SRC_DIR}src/test,,\
-				$(patsubst ${CFG_SRC_DIR}src/gyp,,\
-				$(patsubst ${CFG_SRC_DIR}src/etc,,\
-				$(patsubst ${CFG_SRC_DIR}src/rt,,\
-				$(patsubst ${CFG_SRC_DIR}src/rt/arch,,\
-				$(patsubst ${CFG_SRC_DIR}src/rt/msvc,,\
-				$(patsubst ${CFG_SRC_DIR}src/rt/sundown,,\
-				$(patsubst ${CFG_SRC_DIR}src/rt/vg,,\
-				$(wildcard ${CFG_SRC_DIR}src/*) $(wildcard ${CFG_SRC_DIR}src/rt/*)\
+CTAGS_LOCATIONS=$(patsubst ${CFG_SRC_DIR}src/llvm,, \
+				$(patsubst ${CFG_SRC_DIR}src/libuv,, \
+				$(patsubst ${CFG_SRC_DIR}src/compiletest,, \
+				$(patsubst ${CFG_SRC_DIR}src/test,, \
+				$(patsubst ${CFG_SRC_DIR}src/gyp,, \
+				$(patsubst ${CFG_SRC_DIR}src/etc,, \
+				$(patsubst ${CFG_SRC_DIR}src/rt,, \
+				$(patsubst ${CFG_SRC_DIR}src/rt/arch,, \
+				$(patsubst ${CFG_SRC_DIR}src/rt/msvc,, \
+				$(patsubst ${CFG_SRC_DIR}src/rt/sundown,, \
+				$(patsubst ${CFG_SRC_DIR}src/rt/vg,, \
+				$(wildcard ${CFG_SRC_DIR}src/*) $(wildcard ${CFG_SRC_DIR}src/rt/*) \
 				)))))))))))
 CTAGS_OPTS=--options="${CFG_SRC_DIR}src/etc/ctags.rust" --languages=-javascript --recurse ${CTAGS_LOCATIONS}
 # We could use `--languages=Rust`, but there is value in producing tags for the
--- a/mk/docs.mk
+++ b/mk/docs.mk
@ -112,8 +112,8 @@ HTML_DEPS += doc/version_info.html
 doc/version_info.html: $(D)/version_info.html.template $(MKFILE_DEPS) \
                       $(wildcard $(D)/*.*) | doc/
 	@$(call E, version-info: $@)
-	$(Q)sed -e "s/VERSION/$(CFG_RELEASE)/; s/SHORT_HASH/$(\
-                    CFG_SHORT_VER_HASH)/;\
+	$(Q)sed -e "s/VERSION/$(CFG_RELEASE)/; s/SHORT_HASH/$( \
+                    CFG_SHORT_VER_HASH)/; \
                s/STAMP/$(CFG_VER_HASH)/;" $< >$@

 GENERATED += doc/version.tex doc/version_info.html
--- a/mk/host.mk
+++ b/mk/host.mk
@ -24,12 +24,12 @@ $$(HLIB$(2)_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,\
+	$$(call REMOVE_ALL_OLD_GLOB_MATCHES, \
 	    $$(dir $$@)$$(call CFG_LIB_GLOB_$(3),$(5)))
 	$$(Q)cp $$< $$@
 	$$(Q)cp -R $$(TLIB$(1)_T_$(3)_H_$(4))/$$(call CFG_LIB_GLOB_$(3),$(5)) \
 	        $$(HLIB$(2)_H_$(4))
-	$$(call LIST_ALL_OLD_GLOB_MATCHES,\
+	$$(call LIST_ALL_OLD_GLOB_MATCHES, \
 	    $$(dir $$@)$$(call CFG_LIB_GLOB_$(3),$(5)))
 else
 $$(HLIB$(2)_H_$(4))/stamp.$(5):
--- a/mk/install.mk
+++ b/mk/install.mk
@ -81,15 +81,15 @@ endif
 define INSTALL_RUNTIME_TARGET_N
 install-runtime-target-$(1)-host-$(2): $$(TSREQ$$(ISTAGE)_T_$(1)_H_$(2)) $$(SREQ$$(ISTAGE)_T_$(1)_H_$(2))
 	$$(Q)$$(call ADB_SHELL,mkdir,$(CFG_RUNTIME_PUSH_DIR))
-	$$(Q)$$(foreach crate,$$(TARGET_CRATES),\
-	    $$(call ADB_PUSH,$$(TL$(1)$(2))/$$(call CFG_LIB_GLOB_$(1),$$(crate)),\
+	$$(Q)$$(foreach crate,$$(TARGET_CRATES), \
+	    $$(call ADB_PUSH,$$(TL$(1)$(2))/$$(call CFG_LIB_GLOB_$(1),$$(crate)), \
 			$$(CFG_RUNTIME_PUSH_DIR));)
 endef

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

--- a/mk/main.mk
+++ b/mk/main.mk
@ -167,7 +167,7 @@ endif
 define DEF_X
 X_$(1) := $(CFG_EXE_SUFFIX_$(1))
 endef
-$(foreach target,$(CFG_TARGET),\
+$(foreach target,$(CFG_TARGET), \
  $(eval $(call DEF_X,$(target))))

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

 # Prerequisites for a working stageN compiler and complete set of target
--- a/mk/platform.mk
+++ b/mk/platform.mk
@ -32,7 +32,7 @@ $(foreach t,$(CFG_TARGET),$(info cfg: os for $(t) is $(OSTYPE_$(t))))
 CFG_DSYMUTIL := true

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

 ifdef CFG_DISABLE_OPTIMIZE_CXX
@ -67,7 +67,7 @@ ifneq ($(findstring linux,$(CFG_OSTYPE)),)
    endif
  else
    ifdef CFG_VALGRIND
-      CFG_PERF_TOOL :=\
+      CFG_PERF_TOOL := \
        $(CFG_VALGRIND) --tool=cachegrind --cache-sim=yes --branch-sim=yes
    else
      CFG_PERF_TOOL := /usr/bin/time --verbose
@ -94,7 +94,7 @@ define SET_FROM_CFG
  endif
 endef

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

 CFG_RLIB_GLOB=lib$(1)-*.rlib
@ -591,7 +591,7 @@ define FILTER_FLAGS
  endif
 endef

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


@ -664,5 +664,5 @@ define CFG_MAKE_TOOLCHAIN

 endef

-$(foreach target,$(CFG_TARGET),\
+$(foreach target,$(CFG_TARGET), \
  $(eval $(call CFG_MAKE_TOOLCHAIN,$(target))))
--- a/mk/prepare.mk
+++ b/mk/prepare.mk
@ -52,7 +52,7 @@ define PREPARE_LIB
 	$(nop)
 	@$(call E, prepare: $(PREPARE_WORKING_DEST_LIB_DIR)/$(1))
 	$(Q)LIB_NAME="$(notdir $(lastword $(wildcard $(PREPARE_WORKING_SOURCE_LIB_DIR)/$(1))))"; \
-	MATCHES="$(filter-out %$(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)'" && \
@ -82,11 +82,11 @@ prepare-host-tool-$(1)-$(2)-$(3)-$(4): prepare-maybe-clean-$(4) \
                                  $$(foreach dep,$$(TOOL_DEPS_$(1)),prepare-host-lib-$$(dep)-$(2)-$(3)-$(4)) \
                                  $$(HBIN$(2)_H_$(3))/$(1)$$(X_$(3)) \
                                  prepare-host-dirs-$(4)
-	$$(if $$(findstring $(2), $$(PREPARE_STAGE)),\
-      $$(if $$(findstring $(3), $$(PREPARE_HOST)),\
+	$$(if $$(findstring $(2), $$(PREPARE_STAGE)), \
+      $$(if $$(findstring $(3), $$(PREPARE_HOST)), \
        $$(call PREPARE_BIN,$(1)$$(X_$$(PREPARE_HOST))),),)
-	$$(if $$(findstring $(2), $$(PREPARE_STAGE)),\
-      $$(if $$(findstring $(3), $$(PREPARE_HOST)),\
+	$$(if $$(findstring $(2), $$(PREPARE_STAGE)), \
+      $$(if $$(findstring $(3), $$(PREPARE_HOST)), \
        $$(call PREPARE_MAN,$(1).1),),)
 endef

@ -101,12 +101,12 @@ define DEF_PREPARE_HOST_LIB
 prepare-host-lib-$(1)-$(2)-$(3)-$(4): PREPARE_WORKING_SOURCE_LIB_DIR=$$(PREPARE_SOURCE_LIB_DIR)
 prepare-host-lib-$(1)-$(2)-$(3)-$(4): PREPARE_WORKING_DEST_LIB_DIR=$$(PREPARE_DEST_LIB_DIR)
 prepare-host-lib-$(1)-$(2)-$(3)-$(4): prepare-maybe-clean-$(4) \
-                                 $$(foreach dep,$$(RUST_DEPS_$(1)),prepare-host-lib-$$(dep)-$(2)-$(3)-$(4))\
+                                 $$(foreach dep,$$(RUST_DEPS_$(1)),prepare-host-lib-$$(dep)-$(2)-$(3)-$(4)) \
                                 $$(HLIB$(2)_H_$(3))/stamp.$(1) \
                                 prepare-host-dirs-$(4)
-	$$(if $$(findstring $(2), $$(PREPARE_STAGE)),\
-      $$(if $$(findstring $(3), $$(PREPARE_HOST)),\
-        $$(if $$(findstring 1,$$(ONLY_RLIB_$(1))),,\
+	$$(if $$(findstring $(2), $$(PREPARE_STAGE)), \
+      $$(if $$(findstring $(3), $$(PREPARE_HOST)), \
+        $$(if $$(findstring 1,$$(ONLY_RLIB_$(1))),, \
          $$(call PREPARE_LIB,$$(call CFG_LIB_GLOB_$$(PREPARE_HOST),$(1)))),),)
 endef

@ -129,17 +129,17 @@ prepare-target-$(2)-host-$(3)-$(1)-$(4): prepare-maybe-clean-$(4) \
 # *not* install the rlibs for host crates because there's no need to statically
 # link against most of them. They just produce a large amount of extra size
 # bloat.
-	$$(if $$(findstring $(1), $$(PREPARE_STAGE)),\
-      $$(if $$(findstring $(2), $$(PREPARE_TARGETS)),\
-        $$(if $$(findstring $(3), $$(PREPARE_HOST)),\
-          $$(call PREPARE_DIR,$$(PREPARE_WORKING_DEST_LIB_DIR))\
-          $$(foreach crate,$$(TARGET_CRATES),\
-	    $$(if $$(findstring 1, $$(ONLY_RLIB_$$(crate))),,\
-              $$(call PREPARE_LIB,$$(call CFG_LIB_GLOB_$(2),$$(crate))))\
-            $$(call PREPARE_LIB,$$(call CFG_RLIB_GLOB,$$(crate))))\
-          $$(if $$(findstring $(2),$$(CFG_HOST)),\
-            $$(foreach crate,$$(HOST_CRATES),\
-              $$(call PREPARE_LIB,$$(call CFG_LIB_GLOB_$(2),$$(crate)))),)\
+	$$(if $$(findstring $(1), $$(PREPARE_STAGE)), \
+      $$(if $$(findstring $(2), $$(PREPARE_TARGETS)), \
+        $$(if $$(findstring $(3), $$(PREPARE_HOST)), \
+          $$(call PREPARE_DIR,$$(PREPARE_WORKING_DEST_LIB_DIR)) \
+          $$(foreach crate,$$(TARGET_CRATES), \
+	    $$(if $$(findstring 1, $$(ONLY_RLIB_$$(crate))),, \
+              $$(call PREPARE_LIB,$$(call CFG_LIB_GLOB_$(2),$$(crate)))) \
+            $$(call PREPARE_LIB,$$(call CFG_RLIB_GLOB,$$(crate)))) \
+          $$(if $$(findstring $(2),$$(CFG_HOST)), \
+            $$(foreach crate,$$(HOST_CRATES), \
+              $$(call PREPARE_LIB,$$(call CFG_LIB_GLOB_$(2),$$(crate)))),) \
          $$(call PREPARE_LIB,libmorestack.a) \
          $$(call PREPARE_LIB,libcompiler-rt.a),),),)
 endef
@ -160,8 +160,8 @@ prepare-everything-$(1): prepare-host-$(1) prepare-targets-$(1)
 prepare-host-$(1): prepare-host-tools-$(1)

 prepare-host-tools-$(1): \
-        $$(foreach tool, $$(PREPARE_TOOLS),\
-          $$(foreach host,$$(CFG_HOST),\
+        $$(foreach tool, $$(PREPARE_TOOLS), \
+          $$(foreach host,$$(CFG_HOST), \
            prepare-host-tool-$$(tool)-$$(PREPARE_STAGE)-$$(host)-$(1)))

 prepare-host-dirs-$(1): prepare-maybe-clean-$(1)
@ -169,27 +169,27 @@ prepare-host-dirs-$(1): prepare-maybe-clean-$(1)
 	$$(call PREPARE_DIR,$$(PREPARE_DEST_LIB_DIR))
 	$$(call PREPARE_DIR,$$(PREPARE_DEST_MAN_DIR))

-$$(foreach tool,$$(PREPARE_TOOLS),\
-  $$(foreach host,$$(CFG_HOST),\
+$$(foreach tool,$$(PREPARE_TOOLS), \
+  $$(foreach host,$$(CFG_HOST), \
      $$(eval $$(call DEF_PREPARE_HOST_TOOL,$$(tool),$$(PREPARE_STAGE),$$(host),$(1)))))

-$$(foreach lib,$$(CRATES),\
-  $$(foreach host,$$(CFG_HOST),\
+$$(foreach lib,$$(CRATES), \
+  $$(foreach host,$$(CFG_HOST), \
    $$(eval $$(call DEF_PREPARE_HOST_LIB,$$(lib),$$(PREPARE_STAGE),$$(host),$(1)))))

-prepare-targets-$(1):\
-        $$(foreach host,$$(CFG_HOST),\
-           $$(foreach target,$$(CFG_TARGET),\
+prepare-targets-$(1): \
+        $$(foreach host,$$(CFG_HOST), \
+           $$(foreach target,$$(CFG_TARGET), \
             prepare-target-$$(target)-host-$$(host)-$$(PREPARE_STAGE)-$(1)))

-$$(foreach host,$$(CFG_HOST),\
+$$(foreach host,$$(CFG_HOST), \
  $$(foreach target,$$(CFG_TARGET), \
    $$(eval $$(call DEF_PREPARE_TARGET_N,$$(PREPARE_STAGE),$$(target),$$(host),$(1)))))

 prepare-maybe-clean-$(1):
-	$$(if $$(findstring true,$$(PREPARE_CLEAN)),\
+	$$(if $$(findstring true,$$(PREPARE_CLEAN)), \
      @$$(call E, cleaning destination $$(PREPARE_DEST_DIR)),)
-	$$(if $$(findstring true,$$(PREPARE_CLEAN)),\
+	$$(if $$(findstring true,$$(PREPARE_CLEAN)), \
      $$(Q)rm -rf $$(PREPARE_DEST_DIR),)


--- a/mk/target.mk
+++ b/mk/target.mk
@ -75,9 +75,9 @@ $$(TLIB$(1)_T_$(2)_H_$(3))/stamp.$(4): \
 		$$(TSREQ$(1)_T_$(2)_H_$(3)) \
 		| $$(TLIB$(1)_T_$(2)_H_$(3))/
 	@$$(call E, rustc: $$(@D)/lib$(4))
-	$$(call REMOVE_ALL_OLD_GLOB_MATCHES,\
+	$$(call REMOVE_ALL_OLD_GLOB_MATCHES, \
 	    $$(dir $$@)$$(call CFG_LIB_GLOB_$(2),$(4)))
-	$$(call REMOVE_ALL_OLD_GLOB_MATCHES,\
+	$$(call REMOVE_ALL_OLD_GLOB_MATCHES, \
 	    $$(dir $$@)$$(call CFG_RLIB_GLOB,$(4)))
 	$$(STAGE$(1)_T_$(2)_H_$(3)) \
 		$$(WFLAGS_ST$(1)) \
@ -89,9 +89,9 @@ $$(TLIB$(1)_T_$(2)_H_$(3))/stamp.$(4): \
 		-C extra-filename=-$$(CFG_FILENAME_EXTRA) \
 		$$<
 	@touch $$@
-	$$(call LIST_ALL_OLD_GLOB_MATCHES,\
+	$$(call LIST_ALL_OLD_GLOB_MATCHES, \
 	    $$(dir $$@)$$(call CFG_LIB_GLOB_$(2),$(4)))
-	$$(call LIST_ALL_OLD_GLOB_MATCHES,\
+	$$(call LIST_ALL_OLD_GLOB_MATCHES, \
 	    $$(dir $$@)$$(call CFG_RLIB_GLOB,$(4)))

 endef
--- a/mk/tests.mk
+++ b/mk/tests.mk
@ -75,12 +75,12 @@ TEST_RATCHET_NOISE_PERCENT=10.0

 # Whether to ratchet or merely save benchmarks
 ifdef CFG_RATCHET_BENCH
-CRATE_TEST_EXTRA_ARGS=\
+CRATE_TEST_EXTRA_ARGS= \
  --test $(TEST_BENCH) \
  --ratchet-metrics $(call TEST_RATCHET_FILE,$(1),$(2),$(3),$(4)) \
  --ratchet-noise-percent $(TEST_RATCHET_NOISE_PERCENT)
 else
-CRATE_TEST_EXTRA_ARGS=\
+CRATE_TEST_EXTRA_ARGS= \
  --test $(TEST_BENCH) \
  --save-metrics $(call TEST_RATCHET_FILE,$(1),$(2),$(3),$(4))
 endif
@ -158,9 +158,9 @@ $(info check: android device test dir $(CFG_ADB_TEST_DIR) ready \
 $(shell $(CFG_ADB) shell mkdir $(CFG_ADB_TEST_DIR)) \
 $(shell $(CFG_ADB) shell mkdir $(CFG_ADB_TEST_DIR)/tmp) \
 $(shell $(CFG_ADB) push $(S)src/etc/adb_run_wrapper.sh $(CFG_ADB_TEST_DIR) 1>/dev/null) \
- $(foreach crate,$(TARGET_CRATES),\
+ $(foreach crate,$(TARGET_CRATES), \
    $(shell $(CFG_ADB) push $(TLIB2_T_arm-linux-androideabi_H_$(CFG_BUILD))/$(call CFG_LIB_GLOB_arm-linux-androideabi,$(crate)) \
-                    $(CFG_ADB_TEST_DIR)))\
+                    $(CFG_ADB_TEST_DIR))) \
 )
 else
 CFG_ADB_TEST_DIR=
@ -359,7 +359,7 @@ define TEST_RUNNER
 # parent crates.
 ifeq ($(NO_REBUILD),)
 TESTDEP_$(1)_$(2)_$(3)_$(4) = $$(SREQ$(1)_T_$(2)_H_$(3)) \
-			    $$(foreach crate,$$(TARGET_CRATES),\
+			    $$(foreach crate,$$(TARGET_CRATES), \
 				$$(TLIB$(1)_T_$(2)_H_$(3))/stamp.$$(crate)) \
 				$$(CRATE_FULLDEPS_$(1)_T_$(2)_H_$(3)_$(4))

@ -930,9 +930,9 @@ $(foreach stage,$(STAGES), \
   $(eval $(call DEF_CHECK_FOR_STAGE_AND_HOSTS_AND_GROUP,$(stage),$(host),$(group))))))

 define DEF_CHECK_DOC_FOR_STAGE
-check-stage$(1)-docs: $$(foreach docname,$$(DOCS),\
+check-stage$(1)-docs: $$(foreach docname,$$(DOCS), \
                       check-stage$(1)-T-$$(CFG_BUILD)-H-$$(CFG_BUILD)-doc-$$(docname)) \
-                     $$(foreach crate,$$(TEST_DOC_CRATES),\
+                     $$(foreach crate,$$(TEST_DOC_CRATES), \
                       check-stage$(1)-T-$$(CFG_BUILD)-H-$$(CFG_BUILD)-doc-crate-$$(crate))
 endef