From c5433c3a0f151d0b21ce41dfa623f7352e8bc389 Mon Sep 17 00:00:00 2001 From: Birunthan Mohanathas Date: Tue, 22 Jul 2014 21:37:05 -0700 Subject: [PATCH] mk: Remove extra whitespace before line continuation backslashes --- mk/clean.mk | 48 +++++++++++++-------------- mk/host.mk | 28 ++++++++-------- mk/main.mk | 30 ++++++++--------- mk/platform.mk | 30 ++++++++--------- mk/prepare.mk | 10 +++--- mk/rt.mk | 6 ++-- mk/snap.mk | 4 +-- mk/stage0.mk | 8 ++--- mk/target.mk | 70 +++++++++++++++++++-------------------- mk/tests.mk | 90 +++++++++++++++++++++++++------------------------- 10 files changed, 162 insertions(+), 162 deletions(-) diff --git a/mk/clean.mk b/mk/clean.mk index 725f80ac8b5..da058444da5 100644 --- a/mk/clean.mk +++ b/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 diff --git a/mk/host.mk b/mk/host.mk index ea2ac7a1140..38babc221dc 100644 --- a/mk/host.mk +++ b/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))))) diff --git a/mk/main.mk b/mk/main.mk index 98b83530c8d..3b17af2b08f 100644 --- a/mk/main.mk +++ b/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) diff --git a/mk/platform.mk b/mk/platform.mk index d1ec7c6500d..b409cb2743d 100644 --- a/mk/platform.mk +++ b/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),) diff --git a/mk/prepare.mk b/mk/prepare.mk index 5f485499467..ff4d9e6a887 100644 --- a/mk/prepare.mk +++ b/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 diff --git a/mk/rt.mk b/mk/rt.mk index 49b9d2aad8d..e41dc8f4daa 100644 --- a/mk/rt.mk +++ b/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))))) diff --git a/mk/snap.mk b/mk/snap.mk index a7eb71baf6b..86c89cf0210 100644 --- a/mk/snap.mk +++ b/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) diff --git a/mk/stage0.mk b/mk/stage0.mk index 972cfecea71..4edd9118a56 100644 --- a/mk/stage0.mk +++ b/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)))) diff --git a/mk/target.mk b/mk/target.mk index 7da11a21a7c..b05533fbfc7 100644 --- a/mk/target.mk +++ b/mk/target.mk @@ -29,19 +29,19 @@ WFLAGS_ST2 = -D warnings # $(3) - host # $(4) crate define RUST_CRATE_FULLDEPS -CRATE_FULLDEPS_$(1)_T_$(2)_H_$(3)_$(4) := \ - $$(CRATEFILE_$(4)) \ - $$(RSINPUTS_$(4)) \ - $$(foreach dep,$$(RUST_DEPS_$(4)), \ - $$(TLIB$(1)_T_$(2)_H_$(3))/stamp.$$(dep)) \ - $$(foreach dep,$$(NATIVE_DEPS_$(4)), \ +CRATE_FULLDEPS_$(1)_T_$(2)_H_$(3)_$(4) := \ + $$(CRATEFILE_$(4)) \ + $$(RSINPUTS_$(4)) \ + $$(foreach dep,$$(RUST_DEPS_$(4)), \ + $$(TLIB$(1)_T_$(2)_H_$(3))/stamp.$$(dep)) \ + $$(foreach dep,$$(NATIVE_DEPS_$(4)), \ $$(RT_OUTPUT_DIR_$(2))/$$(call CFG_STATIC_LIB_NAME_$(2),$$(dep))) endef -$(foreach host,$(CFG_HOST), \ - $(foreach target,$(CFG_TARGET), \ - $(foreach stage,$(STAGES), \ - $(foreach crate,$(CRATES), \ +$(foreach host,$(CFG_HOST), \ + $(foreach target,$(CFG_TARGET), \ + $(foreach stage,$(STAGES), \ + $(foreach crate,$(CRATES), \ $(eval $(call RUST_CRATE_FULLDEPS,$(stage),$(target),$(host),$(crate))))))) # RUST_TARGET_STAGE_N template: This defines how target artifacts are built @@ -69,10 +69,10 @@ $(foreach host,$(CFG_HOST), \ define RUST_TARGET_STAGE_N $$(TLIB$(1)_T_$(2)_H_$(3))/stamp.$(4): CFG_COMPILER_HOST_TRIPLE = $(2) -$$(TLIB$(1)_T_$(2)_H_$(3))/stamp.$(4): \ - $$(CRATEFILE_$(4)) \ - $$(CRATE_FULLDEPS_$(1)_T_$(2)_H_$(3)_$(4)) \ - $$(TSREQ$(1)_T_$(2)_H_$(3)) \ +$$(TLIB$(1)_T_$(2)_H_$(3))/stamp.$(4): \ + $$(CRATEFILE_$(4)) \ + $$(CRATE_FULLDEPS_$(1)_T_$(2)_H_$(3)_$(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,\ @@ -110,12 +110,12 @@ endef # $(4) - name of the tool being built define TARGET_TOOL -$$(TBIN$(1)_T_$(2)_H_$(3))/$(4)$$(X_$(2)): \ - $$(TOOL_SOURCE_$(4)) \ - $$(TOOL_INPUTS_$(4)) \ - $$(foreach dep,$$(TOOL_DEPS_$(4)), \ - $$(TLIB$(1)_T_$(2)_H_$(3))/stamp.$$(dep)) \ - $$(TSREQ$(1)_T_$(2)_H_$(3)) \ +$$(TBIN$(1)_T_$(2)_H_$(3))/$(4)$$(X_$(2)): \ + $$(TOOL_SOURCE_$(4)) \ + $$(TOOL_INPUTS_$(4)) \ + $$(foreach dep,$$(TOOL_DEPS_$(4)), \ + $$(TLIB$(1)_T_$(2)_H_$(3))/stamp.$$(dep)) \ + $$(TSREQ$(1)_T_$(2)_H_$(3)) \ | $$(TBIN$(1)_T_$(4)_H_$(3))/ @$$(call E, rustc: $$@) $$(STAGE$(1)_T_$(2)_H_$(3)) -o $$@ $$< --cfg $(4) @@ -155,24 +155,24 @@ $$(TLIB$(1)_T_$(2)_H_$(3))/libmorestack.a: \ $$(Q)cp $$< $$@ endef -$(foreach source,$(CFG_HOST), \ - $(foreach target,$(CFG_TARGET), \ - $(eval $(call TARGET_HOST_RULES,0,$(target),$(source))) \ - $(eval $(call TARGET_HOST_RULES,1,$(target),$(source))) \ - $(eval $(call TARGET_HOST_RULES,2,$(target),$(source))) \ +$(foreach source,$(CFG_HOST), \ + $(foreach target,$(CFG_TARGET), \ + $(eval $(call TARGET_HOST_RULES,0,$(target),$(source))) \ + $(eval $(call TARGET_HOST_RULES,1,$(target),$(source))) \ + $(eval $(call TARGET_HOST_RULES,2,$(target),$(source))) \ $(eval $(call TARGET_HOST_RULES,3,$(target),$(source))))) # In principle, each host can build each target for both libs and tools -$(foreach crate,$(CRATES), \ - $(foreach source,$(CFG_HOST), \ - $(foreach target,$(CFG_TARGET), \ - $(eval $(call RUST_TARGET_STAGE_N,0,$(target),$(source),$(crate))) \ - $(eval $(call RUST_TARGET_STAGE_N,1,$(target),$(source),$(crate))) \ - $(eval $(call RUST_TARGET_STAGE_N,2,$(target),$(source),$(crate))) \ +$(foreach crate,$(CRATES), \ + $(foreach source,$(CFG_HOST), \ + $(foreach target,$(CFG_TARGET), \ + $(eval $(call RUST_TARGET_STAGE_N,0,$(target),$(source),$(crate))) \ + $(eval $(call RUST_TARGET_STAGE_N,1,$(target),$(source),$(crate))) \ + $(eval $(call RUST_TARGET_STAGE_N,2,$(target),$(source),$(crate))) \ $(eval $(call RUST_TARGET_STAGE_N,3,$(target),$(source),$(crate)))))) -$(foreach host,$(CFG_HOST), \ - $(foreach target,$(CFG_TARGET), \ - $(foreach stage,$(STAGES), \ - $(foreach tool,$(TOOLS), \ +$(foreach host,$(CFG_HOST), \ + $(foreach target,$(CFG_TARGET), \ + $(foreach stage,$(STAGES), \ + $(foreach tool,$(TOOLS), \ $(eval $(call TARGET_TOOL,$(stage),$(target),$(host),$(tool))))))) diff --git a/mk/tests.mk b/mk/tests.mk index 2e500ffeb0a..f7931320a5d 100644 --- a/mk/tests.mk +++ b/mk/tests.mk @@ -202,15 +202,15 @@ cleantmptestlogs: cleantestlibs: $(Q)find $(CFG_BUILD)/test \ -name '*.[odasS]' -o \ - -name '*.so' -o \ - -name '*.dylib' -o \ - -name '*.dll' -o \ - -name '*.def' -o \ - -name '*.bc' -o \ - -name '*.dSYM' -o \ - -name '*.libaux' -o \ - -name '*.out' -o \ - -name '*.err' -o \ + -name '*.so' -o \ + -name '*.dylib' -o \ + -name '*.dll' -o \ + -name '*.def' -o \ + -name '*.bc' -o \ + -name '*.dSYM' -o \ + -name '*.libaux' -o \ + -name '*.out' -o \ + -name '*.err' -o \ -name '*.debugger.script' \ | xargs rm -rf @@ -293,16 +293,16 @@ endif define DEF_TEST_SETS -check-stage$(1)-T-$(2)-H-$(3)-exec: \ - check-stage$(1)-T-$(2)-H-$(3)-rpass-exec \ - check-stage$(1)-T-$(2)-H-$(3)-rfail-exec \ - check-stage$(1)-T-$(2)-H-$(3)-cfail-exec \ - check-stage$(1)-T-$(2)-H-$(3)-rpass-full-exec \ - check-stage$(1)-T-$(2)-H-$(3)-cfail-full-exec \ - check-stage$(1)-T-$(2)-H-$(3)-rmake-exec \ - check-stage$(1)-T-$(2)-H-$(3)-crates-exec \ - check-stage$(1)-T-$(2)-H-$(3)-doc-crates-exec \ - check-stage$(1)-T-$(2)-H-$(3)-bench-exec \ +check-stage$(1)-T-$(2)-H-$(3)-exec: \ + check-stage$(1)-T-$(2)-H-$(3)-rpass-exec \ + check-stage$(1)-T-$(2)-H-$(3)-rfail-exec \ + check-stage$(1)-T-$(2)-H-$(3)-cfail-exec \ + check-stage$(1)-T-$(2)-H-$(3)-rpass-full-exec \ + check-stage$(1)-T-$(2)-H-$(3)-cfail-full-exec \ + check-stage$(1)-T-$(2)-H-$(3)-rmake-exec \ + check-stage$(1)-T-$(2)-H-$(3)-crates-exec \ + check-stage$(1)-T-$(2)-H-$(3)-doc-crates-exec \ + check-stage$(1)-T-$(2)-H-$(3)-bench-exec \ check-stage$(1)-T-$(2)-H-$(3)-debuginfo-gdb-exec \ check-stage$(1)-T-$(2)-H-$(3)-debuginfo-lldb-exec \ check-stage$(1)-T-$(2)-H-$(3)-codegen-exec \ @@ -334,10 +334,10 @@ check-stage$(1)-T-$(2)-H-$(3)-doc-exec: \ check-stage$(1)-T-$(2)-H-$(3)-doc-$$(docname)-exec) check-stage$(1)-T-$(2)-H-$(3)-pretty-exec: \ - check-stage$(1)-T-$(2)-H-$(3)-pretty-rpass-exec \ - check-stage$(1)-T-$(2)-H-$(3)-pretty-rpass-full-exec \ - check-stage$(1)-T-$(2)-H-$(3)-pretty-rfail-exec \ - check-stage$(1)-T-$(2)-H-$(3)-pretty-bench-exec \ + check-stage$(1)-T-$(2)-H-$(3)-pretty-rpass-exec \ + check-stage$(1)-T-$(2)-H-$(3)-pretty-rpass-full-exec \ + check-stage$(1)-T-$(2)-H-$(3)-pretty-rfail-exec \ + check-stage$(1)-T-$(2)-H-$(3)-pretty-bench-exec \ check-stage$(1)-T-$(2)-H-$(3)-pretty-pretty-exec endef @@ -377,13 +377,13 @@ TESTDEP_$(1)_$(2)_$(3)_$(4) = $$(RSINPUTS_$(4)) endif $(3)/stage$(1)/test/$(4)test-$(2)$$(X_$(2)): CFG_COMPILER_HOST_TRIPLE = $(2) -$(3)/stage$(1)/test/$(4)test-$(2)$$(X_$(2)): \ +$(3)/stage$(1)/test/$(4)test-$(2)$$(X_$(2)): \ $$(CRATEFILE_$(4)) \ $$(TESTDEP_$(1)_$(2)_$(3)_$(4)) @$$(call E, rustc: $$@) - $$(STAGE$(1)_T_$(2)_H_$(3)) -o $$@ $$< --test \ - -L "$$(RT_OUTPUT_DIR_$(2))" \ - -L "$$(LLVM_LIBDIR_$(2))" \ + $$(STAGE$(1)_T_$(2)_H_$(3)) -o $$@ $$< --test \ + -L "$$(RT_OUTPUT_DIR_$(2))" \ + -L "$$(LLVM_LIBDIR_$(2))" \ $$(RUSTFLAGS_$(4)) endef @@ -600,19 +600,19 @@ ifndef CFG_DISABLE_OPTIMIZE_TESTS CTEST_RUSTC_FLAGS += -O endif -CTEST_COMMON_ARGS$(1)-T-$(2)-H-$(3) := \ - --compile-lib-path $$(HLIB$(1)_H_$(3)) \ - --run-lib-path $$(TLIB$(1)_T_$(2)_H_$(3)) \ - --rustc-path $$(HBIN$(1)_H_$(3))/rustc$$(X_$(3)) \ +CTEST_COMMON_ARGS$(1)-T-$(2)-H-$(3) := \ + --compile-lib-path $$(HLIB$(1)_H_$(3)) \ + --run-lib-path $$(TLIB$(1)_T_$(2)_H_$(3)) \ + --rustc-path $$(HBIN$(1)_H_$(3))/rustc$$(X_$(3)) \ --clang-path $(if $(CFG_CLANG),$(CFG_CLANG),clang) \ --llvm-bin-path $(CFG_LLVM_INST_DIR_$(CFG_BUILD))/bin \ - --aux-base $$(S)src/test/auxiliary/ \ - --stage-id stage$(1)-$(2) \ - --target $(2) \ - --host $(3) \ - --android-cross-path=$(CFG_ANDROID_CROSS_PATH) \ - --adb-path=$(CFG_ADB) \ - --adb-test-dir=$(CFG_ADB_TEST_DIR) \ + --aux-base $$(S)src/test/auxiliary/ \ + --stage-id stage$(1)-$(2) \ + --target $(2) \ + --host $(3) \ + --android-cross-path=$(CFG_ANDROID_CROSS_PATH) \ + --adb-path=$(CFG_ADB) \ + --adb-test-dir=$(CFG_ADB_TEST_DIR) \ --host-rustcflags "$(RUSTC_FLAGS_$(3)) $$(CTEST_RUSTC_FLAGS) -L $$(RT_OUTPUT_DIR_$(3))" \ --lldb-python-dir=$(CFG_LLDB_PYTHON_DIR) \ --target-rustcflags "$(RUSTC_FLAGS_$(2)) $$(CTEST_RUSTC_FLAGS) -L $$(RT_OUTPUT_DIR_$(2))" \ @@ -639,7 +639,7 @@ $(foreach host,$(CFG_HOST), \ define DEF_RUN_COMPILETEST CTEST_ARGS$(1)-T-$(2)-H-$(3)-$(4) := \ - $$(CTEST_COMMON_ARGS$(1)-T-$(2)-H-$(3)) \ + $$(CTEST_COMMON_ARGS$(1)-T-$(2)-H-$(3)) \ --src-base $$(S)src/test/$$(CTEST_SRC_BASE_$(4))/ \ --build-base $(3)/test/$$(CTEST_BUILD_BASE_$(4))/ \ --ratchet-metrics $(call TEST_RATCHET_FILE,$(1),$(2),$(3),$(4)) \ @@ -712,8 +712,8 @@ PRETTY_DIRNAME_pretty-pretty = pretty define DEF_RUN_PRETTY_TEST -PRETTY_ARGS$(1)-T-$(2)-H-$(3)-$(4) := \ - $$(CTEST_COMMON_ARGS$(1)-T-$(2)-H-$(3)) \ +PRETTY_ARGS$(1)-T-$(2)-H-$(3)-$(4) := \ + $$(CTEST_COMMON_ARGS$(1)-T-$(2)-H-$(3)) \ --src-base $$(S)src/test/$$(PRETTY_DIRNAME_$(4))/ \ --build-base $(3)/test/$$(PRETTY_DIRNAME_$(4))/ \ --mode pretty @@ -721,7 +721,7 @@ PRETTY_ARGS$(1)-T-$(2)-H-$(3)-$(4) := \ check-stage$(1)-T-$(2)-H-$(3)-$(4)-exec: $$(call TEST_OK_FILE,$(1),$(2),$(3),$(4)) $$(call TEST_OK_FILE,$(1),$(2),$(3),$(4)): \ - $$(TEST_SREQ$(1)_T_$(2)_H_$(3)) \ + $$(TEST_SREQ$(1)_T_$(2)_H_$(3)) \ $$(PRETTY_DEPS_$(4)) @$$(call E, run pretty-rpass [$(2)]: $$<) $$(Q)$$(call CFG_RUN_CTEST_$(2),$(1),$$<,$(3)) \ @@ -764,7 +764,7 @@ check-stage$(1)-T-$(2)-H-$(3)-doc-$(4)-exec: $$(call TEST_OK_FILE,$(1),$(2),$(3) ifeq ($(NO_REBUILD),) DOCTESTDEP_$(1)_$(2)_$(3)_$(4) = \ $$(D)/$(4).md \ - $$(TEST_SREQ$(1)_T_$(2)_H_$(3)) \ + $$(TEST_SREQ$(1)_T_$(2)_H_$(3)) \ $$(RUSTDOC_EXE_$(1)_T_$(2)_H_$(3)) else DOCTESTDEP_$(1)_$(2)_$(3)_$(4) = $$(D)/$(4).md @@ -795,8 +795,8 @@ define DEF_CRATE_DOC_TEST # rebuilding any of the parent crates. ifeq ($(NO_REBUILD),) CRATEDOCTESTDEP_$(1)_$(2)_$(3)_$(4) = \ - $$(TEST_SREQ$(1)_T_$(2)_H_$(3)) \ - $$(CRATE_FULLDEPS_$(1)_T_$(2)_H_$(3)_$(4)) \ + $$(TEST_SREQ$(1)_T_$(2)_H_$(3)) \ + $$(CRATE_FULLDEPS_$(1)_T_$(2)_H_$(3)_$(4)) \ $$(RUSTDOC_EXE_$(1)_T_$(2)_H_$(3)) else CRATEDOCTESTDEP_$(1)_$(2)_$(3)_$(4) = $$(RSINPUTS_$(4)) -- 2.44.0