auto merge of #19117 : jmesmon/rust/mk-cfg-suffix, r=cmr

Right now we'll end up globbing them into the accepted targets and (ever worse) they will override the make variables of real target files because we `include`d everything in that directory. As a side effect, editors get a better hint on file types.
rust-lang · Nov 22, 2014 · 2af82f7 · 2af82f7
2 parents 81eeec0 + 8581f00
commit 2af82f7
Show file tree

Hide file tree

Showing 17 changed files with 5 additions and 2 deletions.
diff --git a/configure b/configure
@@ -893,7 +893,10 @@ CFG_PREFIX=${CFG_PREFIX%/}
 CFG_MANDIR=${CFG_MANDIR%/}
 CFG_HOST="$(echo $CFG_HOST | tr ',' ' ')"
 CFG_TARGET="$(echo $CFG_TARGET | tr ',' ' ')"
-CFG_SUPPORTED_TARGET="$(ls ${CFG_SRC_DIR}mk/cfg)"
+CFG_SUPPORTED_TARGET=""
+for target_file in ${CFG_SRC_DIR}mk/cfg/*.mk; do
+  CFG_SUPPORTED_TARGET="${CFG_SUPPORTED_TARGET} $(basename "$target_file" .mk)"
+done
 
 # copy host-triples to target-triples so that hosts are a subset of targets
 V_TEMP=""

diff --git a/mk/cfg/arm-apple-ios → mk/cfg/arm-apple-ios.mk b/mk/cfg/arm-apple-ios → mk/cfg/arm-apple-ios.mk
diff --git a/mk/cfg/arm-linux-androideabi → mk/cfg/arm-linux-androideabi.mk b/mk/cfg/arm-linux-androideabi → mk/cfg/arm-linux-androideabi.mk
diff --git a/mk/cfg/arm-unknown-linux-gnueabi → mk/cfg/arm-unknown-linux-gnueabi.mk b/mk/cfg/arm-unknown-linux-gnueabi → mk/cfg/arm-unknown-linux-gnueabi.mk
diff --git a/mk/cfg/arm-unknown-linux-gnueabihf → mk/cfg/arm-unknown-linux-gnueabihf.mk b/mk/cfg/arm-unknown-linux-gnueabihf → mk/cfg/arm-unknown-linux-gnueabihf.mk
diff --git a/mk/cfg/i386-apple-ios → mk/cfg/i386-apple-ios.mk b/mk/cfg/i386-apple-ios → mk/cfg/i386-apple-ios.mk
diff --git a/mk/cfg/i686-apple-darwin → mk/cfg/i686-apple-darwin.mk b/mk/cfg/i686-apple-darwin → mk/cfg/i686-apple-darwin.mk
diff --git a/mk/cfg/i686-pc-windows-gnu → mk/cfg/i686-pc-windows-gnu.mk b/mk/cfg/i686-pc-windows-gnu → mk/cfg/i686-pc-windows-gnu.mk
diff --git a/mk/cfg/i686-unknown-linux-gnu → mk/cfg/i686-unknown-linux-gnu.mk b/mk/cfg/i686-unknown-linux-gnu → mk/cfg/i686-unknown-linux-gnu.mk
diff --git a/mk/cfg/mips-unknown-linux-gnu → mk/cfg/mips-unknown-linux-gnu.mk b/mk/cfg/mips-unknown-linux-gnu → mk/cfg/mips-unknown-linux-gnu.mk
diff --git a/mk/cfg/mipsel-unknown-linux-gnu → mk/cfg/mipsel-unknown-linux-gnu.mk b/mk/cfg/mipsel-unknown-linux-gnu → mk/cfg/mipsel-unknown-linux-gnu.mk
diff --git a/mk/cfg/x86_64-apple-darwin → mk/cfg/x86_64-apple-darwin.mk b/mk/cfg/x86_64-apple-darwin → mk/cfg/x86_64-apple-darwin.mk
diff --git a/mk/cfg/x86_64-pc-windows-gnu → mk/cfg/x86_64-pc-windows-gnu.mk b/mk/cfg/x86_64-pc-windows-gnu → mk/cfg/x86_64-pc-windows-gnu.mk
diff --git a/mk/cfg/x86_64-unknown-dragonfly → mk/cfg/x86_64-unknown-dragonfly.mk b/mk/cfg/x86_64-unknown-dragonfly → mk/cfg/x86_64-unknown-dragonfly.mk
diff --git a/mk/cfg/x86_64-unknown-freebsd → mk/cfg/x86_64-unknown-freebsd.mk b/mk/cfg/x86_64-unknown-freebsd → mk/cfg/x86_64-unknown-freebsd.mk
diff --git a/mk/cfg/x86_64-unknown-linux-gnu → mk/cfg/x86_64-unknown-linux-gnu.mk b/mk/cfg/x86_64-unknown-linux-gnu → mk/cfg/x86_64-unknown-linux-gnu.mk
diff --git a/mk/platform.mk b/mk/platform.mk
@@ -113,7 +113,7 @@ $(foreach cvar,CC CXX CPP CFLAGS CXXFLAGS CPPFLAGS, \
 
 CFG_RLIB_GLOB=lib$(1)-*.rlib
 
-include $(wildcard $(CFG_SRC_DIR)mk/cfg/*)
+include $(wildcard $(CFG_SRC_DIR)mk/cfg/*.mk)
 
 # The -Qunused-arguments sidesteps spurious warnings from clang
 define FILTER_FLAGS