diff --git a/recipes/cargo/cargo_2014-11-19.bb b/recipes/cargo/cargo_2014-11-19.bb
new file mode 100644
index 0000000..72606f3
--- /dev/null
+++ b/recipes/cargo/cargo_2014-11-19.bb
@@ -0,0 +1,7 @@
+SRCREV_cargo = "baa873b09a3d54447516954161d91f794b8ec33d"
+
+SRC_URI_append = "\
+	file://0001-dl-snapshot-be-more-forgiving-to-triples.patch \
+"
+
+require cargo.inc
diff --git a/recipes/cargo/files/0001-dl-snapshot-be-more-forgiving-to-triples.patch b/recipes/cargo/files/0001-dl-snapshot-be-more-forgiving-to-triples.patch
index ce003db..b3de058 100644
--- a/recipes/cargo/files/0001-dl-snapshot-be-more-forgiving-to-triples.patch
+++ b/recipes/cargo/files/0001-dl-snapshot-be-more-forgiving-to-triples.patch
@@ -1,4 +1,4 @@
-From e097e84e4d0f1315d7b20b7c8a59b0060b1343ed Mon Sep 17 00:00:00 2001
+From 5998606dc38d69b1ccf870242b2549dc76b6d418 Mon Sep 17 00:00:00 2001
 From: Cody P Schafer <dev@codyps.com>
 Date: Sun, 16 Nov 2014 21:35:19 -0500
 Subject: [PATCH] dl-snapshot: be more forgiving to triples
@@ -8,10 +8,10 @@ Subject: [PATCH] dl-snapshot: be more forgiving to triples
  1 file changed, 37 insertions(+), 13 deletions(-)
 
 diff --git a/src/etc/dl-snapshot.py b/src/etc/dl-snapshot.py
-index 64329ac..31ada37 100644
+index 096b02e..cfbfc83 100644
 --- a/src/etc/dl-snapshot.py
 +++ b/src/etc/dl-snapshot.py
-@@ -18,20 +18,44 @@ win32 = lines[5]
+@@ -25,20 +25,44 @@ win32 = lines[5]
  win64 = lines[6]
  triple = sys.argv[1]
  
@@ -67,8 +67,8 @@ index 64329ac..31ada37 100644
 +
 +triple = new_triple
  
- platform, hash = me.strip().split(' ')
+ platform, hash = me.strip().split()
  
 -- 
-2.0.4
+2.1.3
 
diff --git a/recipes/rust/files/0020-Support-bindir.patch b/recipes/rust/files/0020-Support-bindir.patch
index ab1c6f7..bad9451 100644
--- a/recipes/rust/files/0020-Support-bindir.patch
+++ b/recipes/rust/files/0020-Support-bindir.patch
@@ -1,7 +1,7 @@
-From e9a22fbdb8e938bd10a7af6972386dfb29f359f0 Mon Sep 17 00:00:00 2001
+From 7059bccadb5cdf560f1c060ed3f785fe935ad68d Mon Sep 17 00:00:00 2001
 From: Cody P Schafer <dev@codyps.com>
 Date: Mon, 17 Nov 2014 19:44:58 -0500
-Subject: [PATCH 20/28] Support --bindir
+Subject: [PATCH 20/29] Support --bindir
 
 ---
  configure          |  4 ++++
@@ -121,5 +121,5 @@ index 4f43b1e..add1c26 100644
          install -m755 "${CFG_SRC_DIR}/$p" "${FILE_INSTALL_PATH}"
      else
 -- 
-2.0.4
+2.1.3
 
diff --git a/recipes/rust/files/0021-Remember-relative-libdir-and-bindir-from-build-time.patch b/recipes/rust/files/0021-Remember-relative-libdir-and-bindir-from-build-time.patch
index 3a5af0f..313bf60 100644
--- a/recipes/rust/files/0021-Remember-relative-libdir-and-bindir-from-build-time.patch
+++ b/recipes/rust/files/0021-Remember-relative-libdir-and-bindir-from-build-time.patch
@@ -1,7 +1,7 @@
-From a8bb6cf82242c69b20390c7ae32d865341b286a7 Mon Sep 17 00:00:00 2001
+From 21379cee1db605007e5eb2b28b1d55ac24c04a5b Mon Sep 17 00:00:00 2001
 From: Cody P Schafer <dev@codyps.com>
 Date: Mon, 17 Nov 2014 20:10:42 -0500
-Subject: [PATCH 21/28] Remember relative libdir and bindir from build time
+Subject: [PATCH 21/29] Remember relative libdir and bindir from build time
 
 ---
  configure                           |  6 +++
@@ -11,7 +11,7 @@ Subject: [PATCH 21/28] Remember relative libdir and bindir from build time
  4 files changed, 37 insertions(+), 47 deletions(-)
 
 diff --git a/configure b/configure
-index bdfeedd..7914601 100755
+index bdfeedd..c9bec44 100755
 --- a/configure
 +++ b/configure
 @@ -340,6 +340,7 @@ need_cmd date
@@ -28,8 +28,8 @@ index bdfeedd..7914601 100755
  
 +# Determine libdir and bindir relative to prefix
 +step_msg "calculating relative paths to prefix = ${CFG_PREFIX}"
-+CFG_BINDIR_RELATIVE=$(realpath -m --relative-to="${CFG_PREFIX}" "${CFG_BINDIR}")
-+CFG_LIBDIR_RELATIVE=$(realpath -m --relative-to="${CFG_PREFIX}" "${CFG_LIBDIR}")
++CFG_BINDIR_RELATIVE=$(realpath --relative-to="${CFG_PREFIX}" "${CFG_BINDIR}")
++CFG_LIBDIR_RELATIVE=$(realpath --relative-to="${CFG_PREFIX}" "${CFG_LIBDIR}")
 +
  # Validate Options
  step_msg "validating $CFG_SELF args"
@@ -174,7 +174,7 @@ index fee289d..b626308 100644
  
  // The name of rustc's own place to organize libraries.
 diff --git a/src/librustc_trans/back/link.rs b/src/librustc_trans/back/link.rs
-index d5d488e..cddf970 100644
+index d27a338..2e1138e 100644
 --- a/src/librustc_trans/back/link.rs
 +++ b/src/librustc_trans/back/link.rs
 @@ -1015,11 +1015,10 @@ fn link_args(cmd: &mut Command,
@@ -191,5 +191,5 @@ index d5d488e..cddf970 100644
              path.push(&tlib);
  
 -- 
-2.0.4
+2.1.3
 
diff --git a/recipes/rust/files/0022-mk-add-missing-CFG_BINDIR_RELATIVE-uses.patch b/recipes/rust/files/0022-mk-add-missing-CFG_BINDIR_RELATIVE-uses.patch
index 718e58b..7c8ecd0 100644
--- a/recipes/rust/files/0022-mk-add-missing-CFG_BINDIR_RELATIVE-uses.patch
+++ b/recipes/rust/files/0022-mk-add-missing-CFG_BINDIR_RELATIVE-uses.patch
@@ -1,7 +1,7 @@
-From 846a56728ba8b7ba64b12c2969bd133a384fc474 Mon Sep 17 00:00:00 2001
+From 44d01c0ca3e2d1f6d6432ce6cef5a6430aade4f2 Mon Sep 17 00:00:00 2001
 From: Cody P Schafer <dev@codyps.com>
 Date: Tue, 18 Nov 2014 13:44:13 -0500
-Subject: [PATCH 22/28] mk: add missing CFG_BINDIR_RELATIVE uses
+Subject: [PATCH 22/29] mk: add missing CFG_BINDIR_RELATIVE uses
 
 ---
  mk/main.mk    | 2 +-
@@ -60,5 +60,5 @@ index 7df2489..842078f 100644
  prepare-base-$(1): PREPARE_DEST_MAN_DIR=$$(PREPARE_DEST_DIR)/share/man/man1
  prepare-base-$(1): prepare-everything-$(1)
 -- 
-2.0.4
+2.1.3
 
diff --git a/recipes/rust/files/0023-mk-add-missing-CFG_LIBDIR_RELATIVE.patch b/recipes/rust/files/0023-mk-add-missing-CFG_LIBDIR_RELATIVE.patch
index c57d94a..ae66ac7 100644
--- a/recipes/rust/files/0023-mk-add-missing-CFG_LIBDIR_RELATIVE.patch
+++ b/recipes/rust/files/0023-mk-add-missing-CFG_LIBDIR_RELATIVE.patch
@@ -1,7 +1,7 @@
-From 0612ce2204bc9376a7fc187700b04c4e3f42e875 Mon Sep 17 00:00:00 2001
+From 6c66b1d90457ef8cf6b6ef73301c5f74f1e41d7d Mon Sep 17 00:00:00 2001
 From: Cody P Schafer <dev@codyps.com>
 Date: Tue, 18 Nov 2014 13:48:14 -0500
-Subject: [PATCH 23/28] mk: add missing CFG_LIBDIR_RELATIVE
+Subject: [PATCH 23/29] mk: add missing CFG_LIBDIR_RELATIVE
 
 ---
  mk/grammar.mk | 4 ++--
@@ -23,5 +23,5 @@ index 12190fb..dcebabf 100644
  
  # Run the reference lexer against libsyntax and compare the tokens and spans.
 -- 
-2.0.4
+2.1.3
 
diff --git a/recipes/rust/files/0024-configure-CFG_-DIR_RELATIVE-avoid-requiring-existenc.patch b/recipes/rust/files/0024-configure-CFG_-DIR_RELATIVE-avoid-requiring-existenc.patch
new file mode 100644
index 0000000..a3d5a9d
--- /dev/null
+++ b/recipes/rust/files/0024-configure-CFG_-DIR_RELATIVE-avoid-requiring-existenc.patch
@@ -0,0 +1,27 @@
+From 9c4d2a42ecae5908e4864352422d5e28457307b3 Mon Sep 17 00:00:00 2001
+From: Cody P Schafer <dev@codyps.com>
+Date: Tue, 18 Nov 2014 14:02:36 -0500
+Subject: [PATCH 24/29] configure: CFG_*DIR_RELATIVE: avoid requiring existence
+
+---
+ configure | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure b/configure
+index c9bec44..7914601 100755
+--- a/configure
++++ b/configure
+@@ -566,8 +566,8 @@ fi
+ 
+ # Determine libdir and bindir relative to prefix
+ step_msg "calculating relative paths to prefix = ${CFG_PREFIX}"
+-CFG_BINDIR_RELATIVE=$(realpath --relative-to="${CFG_PREFIX}" "${CFG_BINDIR}")
+-CFG_LIBDIR_RELATIVE=$(realpath --relative-to="${CFG_PREFIX}" "${CFG_LIBDIR}")
++CFG_BINDIR_RELATIVE=$(realpath -m --relative-to="${CFG_PREFIX}" "${CFG_BINDIR}")
++CFG_LIBDIR_RELATIVE=$(realpath -m --relative-to="${CFG_PREFIX}" "${CFG_LIBDIR}")
+ 
+ # Validate Options
+ step_msg "validating $CFG_SELF args"
+-- 
+2.1.3
+
diff --git a/recipes/rust/files/0024-mk-add-rule-to-create-bindir.patch b/recipes/rust/files/0025-mk-add-rule-to-create-bindir.patch
similarity index 84%
rename from recipes/rust/files/0024-mk-add-rule-to-create-bindir.patch
rename to recipes/rust/files/0025-mk-add-rule-to-create-bindir.patch
index 2715ab4..0734536 100644
--- a/recipes/rust/files/0024-mk-add-rule-to-create-bindir.patch
+++ b/recipes/rust/files/0025-mk-add-rule-to-create-bindir.patch
@@ -1,7 +1,7 @@
-From 0cd38a8844e7511f5db4ab14ec6fa80a2f9a63ec Mon Sep 17 00:00:00 2001
+From 58a621bdfafd3dfb7aa5e9dc7e9df177fe8977eb Mon Sep 17 00:00:00 2001
 From: Cody P Schafer <dev@codyps.com>
 Date: Tue, 18 Nov 2014 14:07:37 -0500
-Subject: [PATCH 24/28] mk: add rule to create bindir
+Subject: [PATCH 25/29] mk: add rule to create bindir
 
 Without this make fails due to not finding a way to create the bindir target.
 ---
@@ -28,5 +28,5 @@ index 59a0095..b8e8345 100644
  
  endef
 -- 
-2.0.4
+2.1.3
 
diff --git a/recipes/rust/files/0025-mk-always-use-bin-and-lib-as-bindir-and-libdir-for-s.patch b/recipes/rust/files/0025-mk-always-use-bin-and-lib-as-bindir-and-libdir-for-s.patch
deleted file mode 100644
index 22f3ab9..0000000
--- a/recipes/rust/files/0025-mk-always-use-bin-and-lib-as-bindir-and-libdir-for-s.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 1e2044eb7a251d850ac01793a6e3d1ccd6171c9d Mon Sep 17 00:00:00 2001
-From: Cody P Schafer <dev@codyps.com>
-Date: Tue, 18 Nov 2014 14:52:56 -0500
-Subject: [PATCH 25/28] mk: always use bin and lib as bindir and libdir for
- stage0 CFG_BUILD
-
----
- mk/main.mk | 10 ++++++++++
- 1 file changed, 10 insertions(+)
-
-diff --git a/mk/main.mk b/mk/main.mk
-index 0fb6f5f..676ea21 100644
---- a/mk/main.mk
-+++ b/mk/main.mk
-@@ -333,8 +333,18 @@ define SREQ
- 
- # Destinations of artifacts for the host compiler
- HROOT$(1)_H_$(3) = $(3)/stage$(1)
-+
-+ifeq ($(1)-$(3),0-$$(CFG_BUILD))
-+# stage0 relative paths are fixed. This is done because we don't have control
-+# over where the bootstrap (snapshot or local) rustc looks to locate it's
-+# libdir. At the moment, this assumes the relative paths (from sysroot aka
-+# prefix) are 'lib' and 'bin'.
-+HBIN$(1)_H_$(3) = $$(HROOT$(1)_H_$(3))/bin
-+HLIB$(1)_H_$(3) = $$(HROOT$(1)_H_$(3))/lib
-+else
- HBIN$(1)_H_$(3) = $$(HROOT$(1)_H_$(3))/$$(CFG_BINDIR_RELATIVE)
- HLIB$(1)_H_$(3) = $$(HROOT$(1)_H_$(3))/$$(CFG_LIBDIR_RELATIVE)
-+endif
- 
- # Destinations of artifacts for target architectures
- TROOT$(1)_T_$(2)_H_$(3) = $$(HLIB$(1)_H_$(3))/rustlib/$(2)
--- 
-2.0.4
-
diff --git a/recipes/rust/files/0026-mk-always-use-bin-as-bindir-for-stage0-CFG_BUILD-and.patch b/recipes/rust/files/0026-mk-always-use-bin-as-bindir-for-stage0-CFG_BUILD-and.patch
new file mode 100644
index 0000000..4492613
--- /dev/null
+++ b/recipes/rust/files/0026-mk-always-use-bin-as-bindir-for-stage0-CFG_BUILD-and.patch
@@ -0,0 +1,70 @@
+From 1cac153be4b71e97ec61c894c3681e803a17f985 Mon Sep 17 00:00:00 2001
+From: Cody P Schafer <dev@codyps.com>
+Date: Tue, 18 Nov 2014 14:52:56 -0500
+Subject: [PATCH 26/29] mk: always use bin as bindir for stage0 CFG_BUILD and
+ pass it an -L to the TLIB dir
+
+We can't trust stage0 rustc to actually know where our libdir is, so we
+need to pass it the location explicitly.
+
+bin is always used as the bindir because that is where it is extracted
+to by the downloader (could be changed in the future if we're inclined)
+---
+ mk/main.mk | 19 +++++++++++++++++++
+ 1 file changed, 19 insertions(+)
+
+diff --git a/mk/main.mk b/mk/main.mk
+index 0fb6f5f..2e6c6c8 100644
+--- a/mk/main.mk
++++ b/mk/main.mk
+@@ -333,7 +333,15 @@ define SREQ
+ 
+ # Destinations of artifacts for the host compiler
+ HROOT$(1)_H_$(3) = $(3)/stage$(1)
++
++ifeq ($(1)-$(3),0-$$(CFG_BUILD))
++# stage0 relative paths are fixed so we can bootstrap from snapshots
++# (downloaded snapshots drop their rustc in HROOT/bin)
++# libdir discrepancy is worked around with RUSTFLAGS below.
++HBIN$(1)_H_$(3) = $$(HROOT$(1)_H_$(3))/bin
++else
+ HBIN$(1)_H_$(3) = $$(HROOT$(1)_H_$(3))/$$(CFG_BINDIR_RELATIVE)
++endif
+ HLIB$(1)_H_$(3) = $$(HROOT$(1)_H_$(3))/$$(CFG_LIBDIR_RELATIVE)
+ 
+ # Destinations of artifacts for target architectures
+@@ -341,6 +349,15 @@ TROOT$(1)_T_$(2)_H_$(3) = $$(HLIB$(1)_H_$(3))/rustlib/$(2)
+ TBIN$(1)_T_$(2)_H_$(3) = $$(TROOT$(1)_T_$(2)_H_$(3))/bin
+ TLIB$(1)_T_$(2)_H_$(3) = $$(TROOT$(1)_T_$(2)_H_$(3))/lib
+ 
++# Don't trust stage0, be explicit about libraries
++# TODO: rather than specifying sysroot, we really want to tell which libdir to
++#       use (ie: the dir containing 'rustlib'). This would allow us to avoid
++#       passing the '-L' options.
++ifeq ($(1),0)
++RUSTFLAGS_S_$(1)_T_$(2)_H_$(3) += --sysroot "$$(HROOT$(1)_H_$(3))" \
++				  -L "$$(TLIB$(1)_T_$(2)_H_$(3))"
++endif
++
+ # Preqrequisites for using the stageN compiler
+ ifeq ($(1),0)
+ HSREQ$(1)_H_$(3) = $$(HBIN$(1)_H_$(3))/rustc$$(X_$(3))
+@@ -450,6 +467,7 @@ STAGE$(1)_T_$(2)_H_$(3) := \
+ 		$$(HBIN$(1)_H_$(3))/rustc$$(X_$(3)) \
+ 		--cfg $$(CFGFLAG$(1)_T_$(2)_H_$(3)) \
+ 		$$(CFG_RUSTC_FLAGS) $$(EXTRAFLAGS_STAGE$(1)) --target=$(2)) \
++		$$(RUSTFLAGS_S_$(1)_T_$(2)_H_$(3)) \
+                 $$(RUSTC_FLAGS_$(2))
+ 
+ PERF_STAGE$(1)_T_$(2)_H_$(3) := \
+@@ -458,6 +476,7 @@ PERF_STAGE$(1)_T_$(2)_H_$(3) := \
+ 		$$(HBIN$(1)_H_$(3))/rustc$$(X_$(3)) \
+ 		--cfg $$(CFGFLAG$(1)_T_$(2)_H_$(3)) \
+ 		$$(CFG_RUSTC_FLAGS) $$(EXTRAFLAGS_STAGE$(1)) --target=$(2)) \
++		$$(RUSTFLAGS_S_$(1)_T_$(2)_H_$(3)) \
+                 $$(RUSTC_FLAGS_$(2))
+ 
+ endef
+-- 
+2.1.3
+
diff --git a/recipes/rust/files/0026-mk-stage0-complain-instead-of-creating-an-empty-file.patch b/recipes/rust/files/0027-mk-stage0-complain-instead-of-creating-an-empty-file.patch
similarity index 85%
rename from recipes/rust/files/0026-mk-stage0-complain-instead-of-creating-an-empty-file.patch
rename to recipes/rust/files/0027-mk-stage0-complain-instead-of-creating-an-empty-file.patch
index f225fa7..0de3836 100644
--- a/recipes/rust/files/0026-mk-stage0-complain-instead-of-creating-an-empty-file.patch
+++ b/recipes/rust/files/0027-mk-stage0-complain-instead-of-creating-an-empty-file.patch
@@ -1,7 +1,7 @@
-From 09fdc1a963093e3b1b3eecb98393dc8a0e933020 Mon Sep 17 00:00:00 2001
+From 70cbf9f2285349700fd1fce8b3e4d2ca25ca53c7 Mon Sep 17 00:00:00 2001
 From: Cody P Schafer <dev@codyps.com>
 Date: Tue, 18 Nov 2014 14:53:39 -0500
-Subject: [PATCH 26/28] mk/stage0: complain instead of creating an empty file
+Subject: [PATCH 27/29] mk/stage0: complain instead of creating an empty file
 
 If the expected rustc snapshot is not where we expect it to be,
 complain and fail at that point rather than creating a empty rustc file
@@ -24,5 +24,5 @@ index e028bba..460a4a7 100644
  # For other targets, let the host build the target:
  
 -- 
-2.0.4
+2.1.3
 
diff --git a/recipes/rust/files/0027-mk-target-fix-typo-so-we-depend-on-the-correct-direc.patch b/recipes/rust/files/0028-mk-target-fix-typo-so-we-depend-on-the-correct-direc.patch
similarity index 85%
rename from recipes/rust/files/0027-mk-target-fix-typo-so-we-depend-on-the-correct-direc.patch
rename to recipes/rust/files/0028-mk-target-fix-typo-so-we-depend-on-the-correct-direc.patch
index 67e9206..4b5b913 100644
--- a/recipes/rust/files/0027-mk-target-fix-typo-so-we-depend-on-the-correct-direc.patch
+++ b/recipes/rust/files/0028-mk-target-fix-typo-so-we-depend-on-the-correct-direc.patch
@@ -1,7 +1,7 @@
-From 8a273a8bb1a2f6f5499b6e79a0894581a1284183 Mon Sep 17 00:00:00 2001
+From 3cee7291722137195a9cc6f6556609ecac75fb8a Mon Sep 17 00:00:00 2001
 From: Cody P Schafer <dev@codyps.com>
 Date: Tue, 18 Nov 2014 16:32:03 -0500
-Subject: [PATCH 27/28] mk/target: fix typo so we depend on the correct
+Subject: [PATCH 28/29] mk/target: fix typo so we depend on the correct
  directory
 
 Without this, if we we're using a non-standard host libdir, the target
@@ -25,5 +25,5 @@ index ed7d8bb..acdf780 100644
  	$$(STAGE$(1)_T_$(2)_H_$(3)) -o $$@ $$< --cfg $(4)
  
 -- 
-2.0.4
+2.1.3
 
diff --git a/recipes/rust/files/0028-rustdoc-avoid-supplying-a-bad-default-sysroot-so-the.patch b/recipes/rust/files/0029-rustdoc-avoid-supplying-a-bad-default-sysroot-so-the.patch
similarity index 88%
rename from recipes/rust/files/0028-rustdoc-avoid-supplying-a-bad-default-sysroot-so-the.patch
rename to recipes/rust/files/0029-rustdoc-avoid-supplying-a-bad-default-sysroot-so-the.patch
index 292e2ce..a01df2c 100644
--- a/recipes/rust/files/0028-rustdoc-avoid-supplying-a-bad-default-sysroot-so-the.patch
+++ b/recipes/rust/files/0029-rustdoc-avoid-supplying-a-bad-default-sysroot-so-the.patch
@@ -1,7 +1,7 @@
-From 370101c62c740c4ef86453277b9cd39561095c54 Mon Sep 17 00:00:00 2001
+From c70d53d795de0d361cdb2220fc348993336be850 Mon Sep 17 00:00:00 2001
 From: Cody P Schafer <dev@codyps.com>
 Date: Tue, 18 Nov 2014 18:56:12 -0500
-Subject: [PATCH 28/28] rustdoc: avoid supplying a bad default sysroot so the
+Subject: [PATCH 29/29] rustdoc: avoid supplying a bad default sysroot so the
  librustc code can calculate it properly
 
 ---
@@ -30,5 +30,5 @@ index 21242e6..b040a4b 100644
          crate_types: vec!(config::CrateTypeRlib),
          lint_opts: vec!((warning_lint, lint::Allow)),
 -- 
-2.0.4
+2.1.3
 
diff --git a/recipes/rust/files/0031-mk-cfg-add-.mk-suffix-on-files-to-avoid-supprises-wh.patch b/recipes/rust/files/0031-mk-cfg-add-.mk-suffix-on-files-to-avoid-supprises-wh.patch
new file mode 100644
index 0000000..977b2af
--- /dev/null
+++ b/recipes/rust/files/0031-mk-cfg-add-.mk-suffix-on-files-to-avoid-supprises-wh.patch
@@ -0,0 +1,1154 @@
+From fc2d485aca7ed7ef9ec944202a47a64383efe33e Mon Sep 17 00:00:00 2001
+From: Cody P Schafer <dev@codyps.com>
+Date: Wed, 19 Nov 2014 14:53:18 -0500
+Subject: [PATCH] mk/cfg: add .mk suffix on files to avoid "supprises" when
+ backup files (file~) are in the directory
+
+---
+ configure                             |  5 ++++-
+ mk/cfg/arm-apple-ios                  | 35 -----------------------------------
+ mk/cfg/arm-apple-ios.mk               | 35 +++++++++++++++++++++++++++++++++++
+ mk/cfg/arm-linux-androideabi          | 29 -----------------------------
+ mk/cfg/arm-linux-androideabi.mk       | 29 +++++++++++++++++++++++++++++
+ mk/cfg/arm-unknown-linux-gnueabi      | 30 ------------------------------
+ mk/cfg/arm-unknown-linux-gnueabi.mk   | 30 ++++++++++++++++++++++++++++++
+ mk/cfg/arm-unknown-linux-gnueabihf    | 30 ------------------------------
+ mk/cfg/arm-unknown-linux-gnueabihf.mk | 30 ++++++++++++++++++++++++++++++
+ mk/cfg/i386-apple-ios                 | 33 ---------------------------------
+ mk/cfg/i386-apple-ios.mk              | 33 +++++++++++++++++++++++++++++++++
+ mk/cfg/i686-apple-darwin              | 27 ---------------------------
+ mk/cfg/i686-apple-darwin.mk           | 27 +++++++++++++++++++++++++++
+ mk/cfg/i686-pc-windows-gnu            | 28 ----------------------------
+ mk/cfg/i686-pc-windows-gnu.mk         | 28 ++++++++++++++++++++++++++++
+ mk/cfg/i686-unknown-linux-gnu         | 27 ---------------------------
+ mk/cfg/i686-unknown-linux-gnu.mk      | 27 +++++++++++++++++++++++++++
+ mk/cfg/mips-unknown-linux-gnu         | 28 ----------------------------
+ mk/cfg/mips-unknown-linux-gnu.mk      | 28 ++++++++++++++++++++++++++++
+ mk/cfg/mipsel-unknown-linux-gnu       | 28 ----------------------------
+ mk/cfg/mipsel-unknown-linux-gnu.mk    | 28 ++++++++++++++++++++++++++++
+ mk/cfg/x86_64-apple-darwin            | 27 ---------------------------
+ mk/cfg/x86_64-apple-darwin.mk         | 27 +++++++++++++++++++++++++++
+ mk/cfg/x86_64-pc-windows-gnu          | 28 ----------------------------
+ mk/cfg/x86_64-pc-windows-gnu.mk       | 28 ++++++++++++++++++++++++++++
+ mk/cfg/x86_64-unknown-dragonfly       | 26 --------------------------
+ mk/cfg/x86_64-unknown-dragonfly.mk    | 26 ++++++++++++++++++++++++++
+ mk/cfg/x86_64-unknown-freebsd         | 26 --------------------------
+ mk/cfg/x86_64-unknown-freebsd.mk      | 26 ++++++++++++++++++++++++++
+ mk/cfg/x86_64-unknown-linux-gnu       | 28 ----------------------------
+ mk/cfg/x86_64-unknown-linux-gnu.mk    | 28 ++++++++++++++++++++++++++++
+ mk/platform.mk                        |  6 +++++-
+ 32 files changed, 439 insertions(+), 432 deletions(-)
+ delete mode 100644 mk/cfg/arm-apple-ios
+ create mode 100644 mk/cfg/arm-apple-ios.mk
+ delete mode 100644 mk/cfg/arm-linux-androideabi
+ create mode 100644 mk/cfg/arm-linux-androideabi.mk
+ delete mode 100644 mk/cfg/arm-unknown-linux-gnueabi
+ create mode 100644 mk/cfg/arm-unknown-linux-gnueabi.mk
+ delete mode 100644 mk/cfg/arm-unknown-linux-gnueabihf
+ create mode 100644 mk/cfg/arm-unknown-linux-gnueabihf.mk
+ delete mode 100644 mk/cfg/i386-apple-ios
+ create mode 100644 mk/cfg/i386-apple-ios.mk
+ delete mode 100644 mk/cfg/i686-apple-darwin
+ create mode 100644 mk/cfg/i686-apple-darwin.mk
+ delete mode 100644 mk/cfg/i686-pc-windows-gnu
+ create mode 100644 mk/cfg/i686-pc-windows-gnu.mk
+ delete mode 100644 mk/cfg/i686-unknown-linux-gnu
+ create mode 100644 mk/cfg/i686-unknown-linux-gnu.mk
+ delete mode 100644 mk/cfg/mips-unknown-linux-gnu
+ create mode 100644 mk/cfg/mips-unknown-linux-gnu.mk
+ delete mode 100644 mk/cfg/mipsel-unknown-linux-gnu
+ create mode 100644 mk/cfg/mipsel-unknown-linux-gnu.mk
+ delete mode 100644 mk/cfg/x86_64-apple-darwin
+ create mode 100644 mk/cfg/x86_64-apple-darwin.mk
+ delete mode 100644 mk/cfg/x86_64-pc-windows-gnu
+ create mode 100644 mk/cfg/x86_64-pc-windows-gnu.mk
+ delete mode 100644 mk/cfg/x86_64-unknown-dragonfly
+ create mode 100644 mk/cfg/x86_64-unknown-dragonfly.mk
+ delete mode 100644 mk/cfg/x86_64-unknown-freebsd
+ create mode 100644 mk/cfg/x86_64-unknown-freebsd.mk
+ delete mode 100644 mk/cfg/x86_64-unknown-linux-gnu
+ create mode 100644 mk/cfg/x86_64-unknown-linux-gnu.mk
+
+diff --git a/configure b/configure
+index 7914601..bff026e 100755
+--- a/configure
++++ b/configure
+@@ -892,7 +892,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 b/mk/cfg/arm-apple-ios
+deleted file mode 100644
+index d1f1ee6..0000000
+--- a/mk/cfg/arm-apple-ios
++++ /dev/null
+@@ -1,35 +0,0 @@
+-# arm-apple-ios configuration
+-CFG_SDK_NAME_arm-apple-ios = iphoneos
+-CFG_SDK_ARCHS_arm-apple-ios = armv7
+-ifneq ($(findstring darwin,$(CFG_OSTYPE)),)
+-CFG_IOS_SDK = $(shell xcrun --show-sdk-path -sdk iphoneos 2>/dev/null)
+-CFG_IOS_FLAGS = -target armv7-apple-ios -isysroot $(CFG_IOS_SDK) -mios-version-min=7.0
+-CC_arm-apple-ios = $(shell xcrun -find -sdk iphoneos clang)
+-CXX_arm-apple-ios = $(shell xcrun -find -sdk iphoneos clang++)
+-CPP_arm-apple-ios = $(shell xcrun -find -sdk iphoneos clang++)
+-AR_arm-apple-ios = $(shell xcrun -find -sdk iphoneos ar)
+-endif
+-CFG_LIB_NAME_arm-apple-ios = lib$(1).a
+-CFG_LIB_GLOB_arm-apple-ios = lib$(1)-*.a
+-CFG_STATIC_LIB_NAME_arm-apple-ios=lib$(1).a
+-CFG_LIB_DSYM_GLOB_arm-apple-ios = lib$(1)-*.a.dSYM
+-CFG_JEMALLOC_CFLAGS_arm-apple-ios := -arch armv7 -mfpu=vfp3 $(CFG_IOS_FLAGS)
+-CFG_GCCISH_CFLAGS_arm-apple-ios := -Wall -Werror -g -fPIC $(CFG_IOS_FLAGS) -mfpu=vfp3 -arch armv7
+-CFG_GCCISH_CXXFLAGS_arm-apple-ios := -fno-rtti $(CFG_IOS_FLAGS) -I$(CFG_IOS_SDK)/usr/include/c++/4.2.1
+-CFG_GCCISH_LINK_FLAGS_arm-apple-ios := -lpthread -syslibroot $(CFG_IOS_SDK) -Wl,-no_compact_unwind
+-CFG_GCCISH_DEF_FLAG_arm-apple-ios := -Wl,-exported_symbols_list,
+-CFG_GCCISH_PRE_LIB_FLAGS_arm-apple-ios :=
+-CFG_GCCISH_POST_LIB_FLAGS_arm-apple-ios :=
+-CFG_DEF_SUFFIX_arm-apple-ios := .darwin.def
+-CFG_LLC_FLAGS_arm-apple-ios := -mattr=+vfp3,+v7,+thumb2,+neon -march=arm
+-CFG_INSTALL_NAME_arm-apple-ios = -Wl,-install_name,@rpath/$(1)
+-CFG_EXE_SUFFIX_arm-apple-ios :=
+-CFG_WINDOWSY_arm-apple-ios :=
+-CFG_UNIXY_arm-apple-ios := 1
+-CFG_PATH_MUNGE_arm-apple-ios := true
+-CFG_LDPATH_arm-apple-ios :=
+-CFG_RUN_arm-apple-ios = $(2)
+-CFG_RUN_TARG_arm-apple-ios = $(call CFG_RUN_arm-apple-ios,,$(2))
+-RUSTC_FLAGS_arm-apple-ios := -C relocation_model=pic
+-RUSTC_CROSS_FLAGS_arm-apple-ios :=-C relocation_model=pic
+-CFG_GNU_TRIPLE_arm-apple-ios := arm-apple-ios
+diff --git a/mk/cfg/arm-apple-ios.mk b/mk/cfg/arm-apple-ios.mk
+new file mode 100644
+index 0000000..d1f1ee6
+--- /dev/null
++++ b/mk/cfg/arm-apple-ios.mk
+@@ -0,0 +1,35 @@
++# arm-apple-ios configuration
++CFG_SDK_NAME_arm-apple-ios = iphoneos
++CFG_SDK_ARCHS_arm-apple-ios = armv7
++ifneq ($(findstring darwin,$(CFG_OSTYPE)),)
++CFG_IOS_SDK = $(shell xcrun --show-sdk-path -sdk iphoneos 2>/dev/null)
++CFG_IOS_FLAGS = -target armv7-apple-ios -isysroot $(CFG_IOS_SDK) -mios-version-min=7.0
++CC_arm-apple-ios = $(shell xcrun -find -sdk iphoneos clang)
++CXX_arm-apple-ios = $(shell xcrun -find -sdk iphoneos clang++)
++CPP_arm-apple-ios = $(shell xcrun -find -sdk iphoneos clang++)
++AR_arm-apple-ios = $(shell xcrun -find -sdk iphoneos ar)
++endif
++CFG_LIB_NAME_arm-apple-ios = lib$(1).a
++CFG_LIB_GLOB_arm-apple-ios = lib$(1)-*.a
++CFG_STATIC_LIB_NAME_arm-apple-ios=lib$(1).a
++CFG_LIB_DSYM_GLOB_arm-apple-ios = lib$(1)-*.a.dSYM
++CFG_JEMALLOC_CFLAGS_arm-apple-ios := -arch armv7 -mfpu=vfp3 $(CFG_IOS_FLAGS)
++CFG_GCCISH_CFLAGS_arm-apple-ios := -Wall -Werror -g -fPIC $(CFG_IOS_FLAGS) -mfpu=vfp3 -arch armv7
++CFG_GCCISH_CXXFLAGS_arm-apple-ios := -fno-rtti $(CFG_IOS_FLAGS) -I$(CFG_IOS_SDK)/usr/include/c++/4.2.1
++CFG_GCCISH_LINK_FLAGS_arm-apple-ios := -lpthread -syslibroot $(CFG_IOS_SDK) -Wl,-no_compact_unwind
++CFG_GCCISH_DEF_FLAG_arm-apple-ios := -Wl,-exported_symbols_list,
++CFG_GCCISH_PRE_LIB_FLAGS_arm-apple-ios :=
++CFG_GCCISH_POST_LIB_FLAGS_arm-apple-ios :=
++CFG_DEF_SUFFIX_arm-apple-ios := .darwin.def
++CFG_LLC_FLAGS_arm-apple-ios := -mattr=+vfp3,+v7,+thumb2,+neon -march=arm
++CFG_INSTALL_NAME_arm-apple-ios = -Wl,-install_name,@rpath/$(1)
++CFG_EXE_SUFFIX_arm-apple-ios :=
++CFG_WINDOWSY_arm-apple-ios :=
++CFG_UNIXY_arm-apple-ios := 1
++CFG_PATH_MUNGE_arm-apple-ios := true
++CFG_LDPATH_arm-apple-ios :=
++CFG_RUN_arm-apple-ios = $(2)
++CFG_RUN_TARG_arm-apple-ios = $(call CFG_RUN_arm-apple-ios,,$(2))
++RUSTC_FLAGS_arm-apple-ios := -C relocation_model=pic
++RUSTC_CROSS_FLAGS_arm-apple-ios :=-C relocation_model=pic
++CFG_GNU_TRIPLE_arm-apple-ios := arm-apple-ios
+diff --git a/mk/cfg/arm-linux-androideabi b/mk/cfg/arm-linux-androideabi
+deleted file mode 100644
+index 471220e..0000000
+--- a/mk/cfg/arm-linux-androideabi
++++ /dev/null
+@@ -1,29 +0,0 @@
+-# arm-linux-androideabi configuration
+-CC_arm-linux-androideabi=$(CFG_ANDROID_CROSS_PATH)/bin/arm-linux-androideabi-gcc
+-CXX_arm-linux-androideabi=$(CFG_ANDROID_CROSS_PATH)/bin/arm-linux-androideabi-g++
+-CPP_arm-linux-androideabi=$(CFG_ANDROID_CROSS_PATH)/bin/arm-linux-androideabi-gcc -E
+-AR_arm-linux-androideabi=$(CFG_ANDROID_CROSS_PATH)/bin/arm-linux-androideabi-ar
+-CFG_LIB_NAME_arm-linux-androideabi=lib$(1).so
+-CFG_STATIC_LIB_NAME_arm-linux-androideabi=lib$(1).a
+-CFG_LIB_GLOB_arm-linux-androideabi=lib$(1)-*.so
+-CFG_LIB_DSYM_GLOB_arm-linux-androideabi=lib$(1)-*.dylib.dSYM
+-CFG_JEMALLOC_CFLAGS_arm-linux-androideabi := -D__arm__ -DANDROID -D__ANDROID__ $(CFLAGS)
+-CFG_GCCISH_CFLAGS_arm-linux-androideabi := -Wall -g -fPIC -D__arm__ -DANDROID -D__ANDROID__ $(CFLAGS)
+-CFG_GCCISH_CXXFLAGS_arm-linux-androideabi := -fno-rtti $(CXXFLAGS)
+-CFG_GCCISH_LINK_FLAGS_arm-linux-androideabi := -shared -fPIC -ldl -g -lm -lsupc++
+-CFG_GCCISH_DEF_FLAG_arm-linux-androideabi := -Wl,--export-dynamic,--dynamic-list=
+-CFG_GCCISH_PRE_LIB_FLAGS_arm-linux-androideabi := -Wl,-whole-archive
+-CFG_GCCISH_POST_LIB_FLAGS_arm-linux-androideabi := -Wl,-no-whole-archive
+-CFG_DEF_SUFFIX_arm-linux-androideabi := .android.def
+-CFG_LLC_FLAGS_arm-linux-androideabi :=
+-CFG_INSTALL_NAME_arm-linux-androideabi =
+-CFG_EXE_SUFFIX_arm-linux-androideabi :=
+-CFG_WINDOWSY_arm-linux-androideabi :=
+-CFG_UNIXY_arm-linux-androideabi := 1
+-CFG_PATH_MUNGE_arm-linux-androideabi := true
+-CFG_LDPATH_arm-linux-androideabi :=
+-CFG_RUN_arm-linux-androideabi=
+-CFG_RUN_TARG_arm-linux-androideabi=
+-RUSTC_FLAGS_arm-linux-androideabi :=
+-RUSTC_CROSS_FLAGS_arm-linux-androideabi :=
+-CFG_GNU_TRIPLE_arm-linux-androideabi := arm-linux-androideabi
+diff --git a/mk/cfg/arm-linux-androideabi.mk b/mk/cfg/arm-linux-androideabi.mk
+new file mode 100644
+index 0000000..471220e
+--- /dev/null
++++ b/mk/cfg/arm-linux-androideabi.mk
+@@ -0,0 +1,29 @@
++# arm-linux-androideabi configuration
++CC_arm-linux-androideabi=$(CFG_ANDROID_CROSS_PATH)/bin/arm-linux-androideabi-gcc
++CXX_arm-linux-androideabi=$(CFG_ANDROID_CROSS_PATH)/bin/arm-linux-androideabi-g++
++CPP_arm-linux-androideabi=$(CFG_ANDROID_CROSS_PATH)/bin/arm-linux-androideabi-gcc -E
++AR_arm-linux-androideabi=$(CFG_ANDROID_CROSS_PATH)/bin/arm-linux-androideabi-ar
++CFG_LIB_NAME_arm-linux-androideabi=lib$(1).so
++CFG_STATIC_LIB_NAME_arm-linux-androideabi=lib$(1).a
++CFG_LIB_GLOB_arm-linux-androideabi=lib$(1)-*.so
++CFG_LIB_DSYM_GLOB_arm-linux-androideabi=lib$(1)-*.dylib.dSYM
++CFG_JEMALLOC_CFLAGS_arm-linux-androideabi := -D__arm__ -DANDROID -D__ANDROID__ $(CFLAGS)
++CFG_GCCISH_CFLAGS_arm-linux-androideabi := -Wall -g -fPIC -D__arm__ -DANDROID -D__ANDROID__ $(CFLAGS)
++CFG_GCCISH_CXXFLAGS_arm-linux-androideabi := -fno-rtti $(CXXFLAGS)
++CFG_GCCISH_LINK_FLAGS_arm-linux-androideabi := -shared -fPIC -ldl -g -lm -lsupc++
++CFG_GCCISH_DEF_FLAG_arm-linux-androideabi := -Wl,--export-dynamic,--dynamic-list=
++CFG_GCCISH_PRE_LIB_FLAGS_arm-linux-androideabi := -Wl,-whole-archive
++CFG_GCCISH_POST_LIB_FLAGS_arm-linux-androideabi := -Wl,-no-whole-archive
++CFG_DEF_SUFFIX_arm-linux-androideabi := .android.def
++CFG_LLC_FLAGS_arm-linux-androideabi :=
++CFG_INSTALL_NAME_arm-linux-androideabi =
++CFG_EXE_SUFFIX_arm-linux-androideabi :=
++CFG_WINDOWSY_arm-linux-androideabi :=
++CFG_UNIXY_arm-linux-androideabi := 1
++CFG_PATH_MUNGE_arm-linux-androideabi := true
++CFG_LDPATH_arm-linux-androideabi :=
++CFG_RUN_arm-linux-androideabi=
++CFG_RUN_TARG_arm-linux-androideabi=
++RUSTC_FLAGS_arm-linux-androideabi :=
++RUSTC_CROSS_FLAGS_arm-linux-androideabi :=
++CFG_GNU_TRIPLE_arm-linux-androideabi := arm-linux-androideabi
+diff --git a/mk/cfg/arm-unknown-linux-gnueabi b/mk/cfg/arm-unknown-linux-gnueabi
+deleted file mode 100644
+index b4c604b..0000000
+--- a/mk/cfg/arm-unknown-linux-gnueabi
++++ /dev/null
+@@ -1,30 +0,0 @@
+-# arm-unknown-linux-gnueabi configuration
+-CROSS_PREFIX_arm-unknown-linux-gnueabi=arm-linux-gnueabi-
+-CC_arm-unknown-linux-gnueabi=gcc
+-CXX_arm-unknown-linux-gnueabi=g++
+-CPP_arm-unknown-linux-gnueabi=gcc -E
+-AR_arm-unknown-linux-gnueabi=ar
+-CFG_LIB_NAME_arm-unknown-linux-gnueabi=lib$(1).so
+-CFG_STATIC_LIB_NAME_arm-unknown-linux-gnueabi=lib$(1).a
+-CFG_LIB_GLOB_arm-unknown-linux-gnueabi=lib$(1)-*.so
+-CFG_LIB_DSYM_GLOB_arm-unknown-linux-gnueabi=lib$(1)-*.dylib.dSYM
+-CFG_JEMALLOC_CFLAGS_arm-unknown-linux-gnueabi := -D__arm__ -mfpu=vfp $(CFLAGS)
+-CFG_GCCISH_CFLAGS_arm-unknown-linux-gnueabi := -Wall -g -fPIC -D__arm__ -mfpu=vfp $(CFLAGS)
+-CFG_GCCISH_CXXFLAGS_arm-unknown-linux-gnueabi := -fno-rtti $(CXXFLAGS)
+-CFG_GCCISH_LINK_FLAGS_arm-unknown-linux-gnueabi := -shared -fPIC -g
+-CFG_GCCISH_DEF_FLAG_arm-unknown-linux-gnueabi := -Wl,--export-dynamic,--dynamic-list=
+-CFG_GCCISH_PRE_LIB_FLAGS_arm-unknown-linux-gnueabi := -Wl,-whole-archive
+-CFG_GCCISH_POST_LIB_FLAGS_arm-unknown-linux-gnueabi := -Wl,-no-whole-archive
+-CFG_DEF_SUFFIX_arm-unknown-linux-gnueabi := .linux.def
+-CFG_LLC_FLAGS_arm-unknown-linux-gnueabi :=
+-CFG_INSTALL_NAME_arm-unknown-linux-gnueabi =
+-CFG_EXE_SUFFIX_arm-unknown-linux-gnueabi :=
+-CFG_WINDOWSY_arm-unknown-linux-gnueabi :=
+-CFG_UNIXY_arm-unknown-linux-gnueabi := 1
+-CFG_PATH_MUNGE_arm-unknown-linux-gnueabi := true
+-CFG_LDPATH_arm-unknown-linux-gnueabi :=
+-CFG_RUN_arm-unknown-linux-gnueabi=$(2)
+-CFG_RUN_TARG_arm-unknown-linux-gnueabi=$(call CFG_RUN_arm-unknown-linux-gnueabi,,$(2))
+-RUSTC_FLAGS_arm-unknown-linux-gnueabi :=
+-RUSTC_CROSS_FLAGS_arm-unknown-linux-gnueabi :=
+-CFG_GNU_TRIPLE_arm-unknown-linux-gnueabi := arm-unknown-linux-gnueabi
+diff --git a/mk/cfg/arm-unknown-linux-gnueabi.mk b/mk/cfg/arm-unknown-linux-gnueabi.mk
+new file mode 100644
+index 0000000..b4c604b
+--- /dev/null
++++ b/mk/cfg/arm-unknown-linux-gnueabi.mk
+@@ -0,0 +1,30 @@
++# arm-unknown-linux-gnueabi configuration
++CROSS_PREFIX_arm-unknown-linux-gnueabi=arm-linux-gnueabi-
++CC_arm-unknown-linux-gnueabi=gcc
++CXX_arm-unknown-linux-gnueabi=g++
++CPP_arm-unknown-linux-gnueabi=gcc -E
++AR_arm-unknown-linux-gnueabi=ar
++CFG_LIB_NAME_arm-unknown-linux-gnueabi=lib$(1).so
++CFG_STATIC_LIB_NAME_arm-unknown-linux-gnueabi=lib$(1).a
++CFG_LIB_GLOB_arm-unknown-linux-gnueabi=lib$(1)-*.so
++CFG_LIB_DSYM_GLOB_arm-unknown-linux-gnueabi=lib$(1)-*.dylib.dSYM
++CFG_JEMALLOC_CFLAGS_arm-unknown-linux-gnueabi := -D__arm__ -mfpu=vfp $(CFLAGS)
++CFG_GCCISH_CFLAGS_arm-unknown-linux-gnueabi := -Wall -g -fPIC -D__arm__ -mfpu=vfp $(CFLAGS)
++CFG_GCCISH_CXXFLAGS_arm-unknown-linux-gnueabi := -fno-rtti $(CXXFLAGS)
++CFG_GCCISH_LINK_FLAGS_arm-unknown-linux-gnueabi := -shared -fPIC -g
++CFG_GCCISH_DEF_FLAG_arm-unknown-linux-gnueabi := -Wl,--export-dynamic,--dynamic-list=
++CFG_GCCISH_PRE_LIB_FLAGS_arm-unknown-linux-gnueabi := -Wl,-whole-archive
++CFG_GCCISH_POST_LIB_FLAGS_arm-unknown-linux-gnueabi := -Wl,-no-whole-archive
++CFG_DEF_SUFFIX_arm-unknown-linux-gnueabi := .linux.def
++CFG_LLC_FLAGS_arm-unknown-linux-gnueabi :=
++CFG_INSTALL_NAME_arm-unknown-linux-gnueabi =
++CFG_EXE_SUFFIX_arm-unknown-linux-gnueabi :=
++CFG_WINDOWSY_arm-unknown-linux-gnueabi :=
++CFG_UNIXY_arm-unknown-linux-gnueabi := 1
++CFG_PATH_MUNGE_arm-unknown-linux-gnueabi := true
++CFG_LDPATH_arm-unknown-linux-gnueabi :=
++CFG_RUN_arm-unknown-linux-gnueabi=$(2)
++CFG_RUN_TARG_arm-unknown-linux-gnueabi=$(call CFG_RUN_arm-unknown-linux-gnueabi,,$(2))
++RUSTC_FLAGS_arm-unknown-linux-gnueabi :=
++RUSTC_CROSS_FLAGS_arm-unknown-linux-gnueabi :=
++CFG_GNU_TRIPLE_arm-unknown-linux-gnueabi := arm-unknown-linux-gnueabi
+diff --git a/mk/cfg/arm-unknown-linux-gnueabihf b/mk/cfg/arm-unknown-linux-gnueabihf
+deleted file mode 100644
+index 4f02de0..0000000
+--- a/mk/cfg/arm-unknown-linux-gnueabihf
++++ /dev/null
+@@ -1,30 +0,0 @@
+-# arm-unknown-linux-gnueabihf configuration
+-CROSS_PREFIX_arm-unknown-linux-gnueabihf=arm-linux-gnueabihf-
+-CC_arm-unknown-linux-gnueabihf=gcc
+-CXX_arm-unknown-linux-gnueabihf=g++
+-CPP_arm-unknown-linux-gnueabihf=gcc -E
+-AR_arm-unknown-linux-gnueabihf=ar
+-CFG_LIB_NAME_arm-unknown-linux-gnueabihf=lib$(1).so
+-CFG_STATIC_LIB_NAME_arm-unknown-linux-gnueabihf=lib$(1).a
+-CFG_LIB_GLOB_arm-unknown-linux-gnueabihf=lib$(1)-*.so
+-CFG_LIB_DSYM_GLOB_arm-unknown-linux-gnueabihf=lib$(1)-*.dylib.dSYM
+-CFG_JEMALLOC_CFLAGS_arm-unknown-linux-gnueabihf := -D__arm__ $(CFLAGS)
+-CFG_GCCISH_CFLAGS_arm-unknown-linux-gnueabihf := -Wall -g -fPIC -D__arm__ $(CFLAGS)
+-CFG_GCCISH_CXXFLAGS_arm-unknown-linux-gnueabihf := -fno-rtti $(CXXFLAGS)
+-CFG_GCCISH_LINK_FLAGS_arm-unknown-linux-gnueabihf := -shared -fPIC -g
+-CFG_GCCISH_DEF_FLAG_arm-unknown-linux-gnueabihf := -Wl,--export-dynamic,--dynamic-list=
+-CFG_GCCISH_PRE_LIB_FLAGS_arm-unknown-linux-gnueabihf := -Wl,-whole-archive
+-CFG_GCCISH_POST_LIB_FLAGS_arm-unknown-linux-gnueabihf := -Wl,-no-whole-archive
+-CFG_DEF_SUFFIX_arm-unknown-linux-gnueabihf := .linux.def
+-CFG_LLC_FLAGS_arm-unknown-linux-gnueabihf :=
+-CFG_INSTALL_NAME_ar,-unknown-linux-gnueabihf =
+-CFG_EXE_SUFFIX_arm-unknown-linux-gnueabihf :=
+-CFG_WINDOWSY_arm-unknown-linux-gnueabihf :=
+-CFG_UNIXY_arm-unknown-linux-gnueabihf := 1
+-CFG_PATH_MUNGE_arm-unknown-linux-gnueabihf := true
+-CFG_LDPATH_arm-unknown-linux-gnueabihf :=
+-CFG_RUN_arm-unknown-linux-gnueabihf=$(2)
+-CFG_RUN_TARG_arm-unknown-linux-gnueabihf=$(call CFG_RUN_arm-unknown-linux-gnueabihf,,$(2))
+-RUSTC_FLAGS_arm-unknown-linux-gnueabihf := -C target-feature=+v6,+vfp2
+-RUSTC_CROSS_FLAGS_arm-unknown-linux-gnueabihf :=
+-CFG_GNU_TRIPLE_arm-unknown-linux-gnueabihf := arm-unknown-linux-gnueabihf
+diff --git a/mk/cfg/arm-unknown-linux-gnueabihf.mk b/mk/cfg/arm-unknown-linux-gnueabihf.mk
+new file mode 100644
+index 0000000..4f02de0
+--- /dev/null
++++ b/mk/cfg/arm-unknown-linux-gnueabihf.mk
+@@ -0,0 +1,30 @@
++# arm-unknown-linux-gnueabihf configuration
++CROSS_PREFIX_arm-unknown-linux-gnueabihf=arm-linux-gnueabihf-
++CC_arm-unknown-linux-gnueabihf=gcc
++CXX_arm-unknown-linux-gnueabihf=g++
++CPP_arm-unknown-linux-gnueabihf=gcc -E
++AR_arm-unknown-linux-gnueabihf=ar
++CFG_LIB_NAME_arm-unknown-linux-gnueabihf=lib$(1).so
++CFG_STATIC_LIB_NAME_arm-unknown-linux-gnueabihf=lib$(1).a
++CFG_LIB_GLOB_arm-unknown-linux-gnueabihf=lib$(1)-*.so
++CFG_LIB_DSYM_GLOB_arm-unknown-linux-gnueabihf=lib$(1)-*.dylib.dSYM
++CFG_JEMALLOC_CFLAGS_arm-unknown-linux-gnueabihf := -D__arm__ $(CFLAGS)
++CFG_GCCISH_CFLAGS_arm-unknown-linux-gnueabihf := -Wall -g -fPIC -D__arm__ $(CFLAGS)
++CFG_GCCISH_CXXFLAGS_arm-unknown-linux-gnueabihf := -fno-rtti $(CXXFLAGS)
++CFG_GCCISH_LINK_FLAGS_arm-unknown-linux-gnueabihf := -shared -fPIC -g
++CFG_GCCISH_DEF_FLAG_arm-unknown-linux-gnueabihf := -Wl,--export-dynamic,--dynamic-list=
++CFG_GCCISH_PRE_LIB_FLAGS_arm-unknown-linux-gnueabihf := -Wl,-whole-archive
++CFG_GCCISH_POST_LIB_FLAGS_arm-unknown-linux-gnueabihf := -Wl,-no-whole-archive
++CFG_DEF_SUFFIX_arm-unknown-linux-gnueabihf := .linux.def
++CFG_LLC_FLAGS_arm-unknown-linux-gnueabihf :=
++CFG_INSTALL_NAME_ar,-unknown-linux-gnueabihf =
++CFG_EXE_SUFFIX_arm-unknown-linux-gnueabihf :=
++CFG_WINDOWSY_arm-unknown-linux-gnueabihf :=
++CFG_UNIXY_arm-unknown-linux-gnueabihf := 1
++CFG_PATH_MUNGE_arm-unknown-linux-gnueabihf := true
++CFG_LDPATH_arm-unknown-linux-gnueabihf :=
++CFG_RUN_arm-unknown-linux-gnueabihf=$(2)
++CFG_RUN_TARG_arm-unknown-linux-gnueabihf=$(call CFG_RUN_arm-unknown-linux-gnueabihf,,$(2))
++RUSTC_FLAGS_arm-unknown-linux-gnueabihf := -C target-feature=+v6,+vfp2
++RUSTC_CROSS_FLAGS_arm-unknown-linux-gnueabihf :=
++CFG_GNU_TRIPLE_arm-unknown-linux-gnueabihf := arm-unknown-linux-gnueabihf
+diff --git a/mk/cfg/i386-apple-ios b/mk/cfg/i386-apple-ios
+deleted file mode 100644
+index 63eb590..0000000
+--- a/mk/cfg/i386-apple-ios
++++ /dev/null
+@@ -1,33 +0,0 @@
+-# i386-apple-ios configuration
+-CFG_SDK_NAME_i386-apple-ios = iphonesimulator
+-CFG_SDK_ARCHS_i386-apple-ios = i386
+-ifneq ($(findstring darwin,$(CFG_OSTYPE)),)
+-CFG_IOSSIM_SDK = $(shell xcrun --show-sdk-path -sdk iphonesimulator 2>/dev/null)
+-CFG_IOSSIM_FLAGS = -target i386-apple-ios -isysroot $(CFG_IOSSIM_SDK) -mios-simulator-version-min=7.0
+-CC_i386-apple-ios = $(shell xcrun -find -sdk iphonesimulator clang)
+-CXX_i386-apple-ios = $(shell xcrun -find -sdk iphonesimulator clang++)
+-CPP_i386-apple-ios = $(shell xcrun -find -sdk iphonesimulator clang++)
+-AR_i386-apple-ios = $(shell xcrun -find -sdk iphonesimulator ar)
+-endif
+-CFG_LIB_NAME_i386-apple-ios = lib$(1).a
+-CFG_LIB_GLOB_i386-apple-ios = lib$(1)-*.dylib
+-CFG_STATIC_LIB_NAME_i386-apple-ios=lib$(1).a
+-CFG_LIB_DSYM_GLOB_i386-apple-ios = lib$(1)-*.dylib.dSYM
+-CFG_GCCISH_CFLAGS_i386-apple-ios = -Wall -Werror -g -fPIC -m32 $(CFG_IOSSIM_FLAGS)
+-CFG_GCCISH_CXXFLAGS_i386-apple-ios = -fno-rtti $(CFG_IOSSIM_FLAGS) -I$(CFG_IOSSIM_SDK)/usr/include/c++/4.2.1
+-CFG_GCCISH_LINK_FLAGS_i386-apple-ios = -lpthread -Wl,-no_compact_unwind -m32 -Wl,-syslibroot $(CFG_IOSSIM_SDK)
+-CFG_GCCISH_DEF_FLAG_i386-apple-ios = -Wl,-exported_symbols_list,
+-CFG_GCCISH_PRE_LIB_FLAGS_i386-apple-ios =
+-CFG_GCCISH_POST_LIB_FLAGS_i386-apple-ios =
+-CFG_DEF_SUFFIX_i386-apple-ios = .darwin.def
+-CFG_LLC_FLAGS_i386-apple-ios =
+-CFG_INSTALL_NAME_i386-apple-ios = -Wl,-install_name,@rpath/$(1)
+-CFG_EXE_SUFFIX_i386-apple-ios =
+-CFG_WINDOWSY_i386-apple-ios =
+-CFG_UNIXY_i386-apple-ios = 1
+-CFG_PATH_MUNGE_i386-apple-ios = true
+-CFG_LDPATH_i386-apple-ios =
+-CFG_RUN_i386-apple-ios = $(2)
+-CFG_RUN_TARG_i386-apple-ios = $(call CFG_RUN_i386-apple-ios,,$(2))
+-CFG_JEMALLOC_CFLAGS_i386-apple-ios = $(CFG_IOSSIM_FLAGS) -target i386-apple-ios -Wl,-syslibroot $(CFG_IOSSIM_SDK) -Wl,-no_compact_unwind
+-CFG_GNU_TRIPLE_i386-apple-ios := i386-apple-ios
+diff --git a/mk/cfg/i386-apple-ios.mk b/mk/cfg/i386-apple-ios.mk
+new file mode 100644
+index 0000000..63eb590
+--- /dev/null
++++ b/mk/cfg/i386-apple-ios.mk
+@@ -0,0 +1,33 @@
++# i386-apple-ios configuration
++CFG_SDK_NAME_i386-apple-ios = iphonesimulator
++CFG_SDK_ARCHS_i386-apple-ios = i386
++ifneq ($(findstring darwin,$(CFG_OSTYPE)),)
++CFG_IOSSIM_SDK = $(shell xcrun --show-sdk-path -sdk iphonesimulator 2>/dev/null)
++CFG_IOSSIM_FLAGS = -target i386-apple-ios -isysroot $(CFG_IOSSIM_SDK) -mios-simulator-version-min=7.0
++CC_i386-apple-ios = $(shell xcrun -find -sdk iphonesimulator clang)
++CXX_i386-apple-ios = $(shell xcrun -find -sdk iphonesimulator clang++)
++CPP_i386-apple-ios = $(shell xcrun -find -sdk iphonesimulator clang++)
++AR_i386-apple-ios = $(shell xcrun -find -sdk iphonesimulator ar)
++endif
++CFG_LIB_NAME_i386-apple-ios = lib$(1).a
++CFG_LIB_GLOB_i386-apple-ios = lib$(1)-*.dylib
++CFG_STATIC_LIB_NAME_i386-apple-ios=lib$(1).a
++CFG_LIB_DSYM_GLOB_i386-apple-ios = lib$(1)-*.dylib.dSYM
++CFG_GCCISH_CFLAGS_i386-apple-ios = -Wall -Werror -g -fPIC -m32 $(CFG_IOSSIM_FLAGS)
++CFG_GCCISH_CXXFLAGS_i386-apple-ios = -fno-rtti $(CFG_IOSSIM_FLAGS) -I$(CFG_IOSSIM_SDK)/usr/include/c++/4.2.1
++CFG_GCCISH_LINK_FLAGS_i386-apple-ios = -lpthread -Wl,-no_compact_unwind -m32 -Wl,-syslibroot $(CFG_IOSSIM_SDK)
++CFG_GCCISH_DEF_FLAG_i386-apple-ios = -Wl,-exported_symbols_list,
++CFG_GCCISH_PRE_LIB_FLAGS_i386-apple-ios =
++CFG_GCCISH_POST_LIB_FLAGS_i386-apple-ios =
++CFG_DEF_SUFFIX_i386-apple-ios = .darwin.def
++CFG_LLC_FLAGS_i386-apple-ios =
++CFG_INSTALL_NAME_i386-apple-ios = -Wl,-install_name,@rpath/$(1)
++CFG_EXE_SUFFIX_i386-apple-ios =
++CFG_WINDOWSY_i386-apple-ios =
++CFG_UNIXY_i386-apple-ios = 1
++CFG_PATH_MUNGE_i386-apple-ios = true
++CFG_LDPATH_i386-apple-ios =
++CFG_RUN_i386-apple-ios = $(2)
++CFG_RUN_TARG_i386-apple-ios = $(call CFG_RUN_i386-apple-ios,,$(2))
++CFG_JEMALLOC_CFLAGS_i386-apple-ios = $(CFG_IOSSIM_FLAGS) -target i386-apple-ios -Wl,-syslibroot $(CFG_IOSSIM_SDK) -Wl,-no_compact_unwind
++CFG_GNU_TRIPLE_i386-apple-ios := i386-apple-ios
+diff --git a/mk/cfg/i686-apple-darwin b/mk/cfg/i686-apple-darwin
+deleted file mode 100644
+index e935ce0..0000000
+--- a/mk/cfg/i686-apple-darwin
++++ /dev/null
+@@ -1,27 +0,0 @@
+-# i686-apple-darwin configuration
+-CC_i686-apple-darwin=$(CC)
+-CXX_i686-apple-darwin=$(CXX)
+-CPP_i686-apple-darwin=$(CPP)
+-AR_i686-apple-darwin=$(AR)
+-CFG_LIB_NAME_i686-apple-darwin=lib$(1).dylib
+-CFG_STATIC_LIB_NAME_i686-apple-darwin=lib$(1).a
+-CFG_LIB_GLOB_i686-apple-darwin=lib$(1)-*.dylib
+-CFG_LIB_DSYM_GLOB_i686-apple-darwin=lib$(1)-*.dylib.dSYM
+-CFG_JEMALLOC_CFLAGS_i686-apple-darwin := -m32 -arch i386 $(CFLAGS)
+-CFG_GCCISH_CFLAGS_i686-apple-darwin := -Wall -Werror -g -fPIC -m32 -arch i386 $(CFLAGS)
+-CFG_GCCISH_CXXFLAGS_i686-apple-darwin := -fno-rtti $(CXXFLAGS)
+-CFG_GCCISH_LINK_FLAGS_i686-apple-darwin := -dynamiclib -pthread  -framework CoreServices -m32
+-CFG_GCCISH_DEF_FLAG_i686-apple-darwin := -Wl,-exported_symbols_list,
+-CFG_GCCISH_PRE_LIB_FLAGS_i686-apple-darwin :=
+-CFG_GCCISH_POST_LIB_FLAGS_i686-apple-darwin :=
+-CFG_DEF_SUFFIX_i686-apple-darwin := .darwin.def
+-CFG_LLC_FLAGS_i686-apple-darwin :=
+-CFG_INSTALL_NAME_i686-apple-darwin = -Wl,-install_name,@rpath/$(1)
+-CFG_EXE_SUFFIX_i686-apple-darwin :=
+-CFG_WINDOWSY_i686-apple-darwin :=
+-CFG_UNIXY_i686-apple-darwin := 1
+-CFG_PATH_MUNGE_i686-apple-darwin := true
+-CFG_LDPATH_i686-apple-darwin :=
+-CFG_RUN_i686-apple-darwin=$(2)
+-CFG_RUN_TARG_i686-apple-darwin=$(call CFG_RUN_i686-apple-darwin,,$(2))
+-CFG_GNU_TRIPLE_i686-apple-darwin := i686-apple-darwin
+diff --git a/mk/cfg/i686-apple-darwin.mk b/mk/cfg/i686-apple-darwin.mk
+new file mode 100644
+index 0000000..e935ce0
+--- /dev/null
++++ b/mk/cfg/i686-apple-darwin.mk
+@@ -0,0 +1,27 @@
++# i686-apple-darwin configuration
++CC_i686-apple-darwin=$(CC)
++CXX_i686-apple-darwin=$(CXX)
++CPP_i686-apple-darwin=$(CPP)
++AR_i686-apple-darwin=$(AR)
++CFG_LIB_NAME_i686-apple-darwin=lib$(1).dylib
++CFG_STATIC_LIB_NAME_i686-apple-darwin=lib$(1).a
++CFG_LIB_GLOB_i686-apple-darwin=lib$(1)-*.dylib
++CFG_LIB_DSYM_GLOB_i686-apple-darwin=lib$(1)-*.dylib.dSYM
++CFG_JEMALLOC_CFLAGS_i686-apple-darwin := -m32 -arch i386 $(CFLAGS)
++CFG_GCCISH_CFLAGS_i686-apple-darwin := -Wall -Werror -g -fPIC -m32 -arch i386 $(CFLAGS)
++CFG_GCCISH_CXXFLAGS_i686-apple-darwin := -fno-rtti $(CXXFLAGS)
++CFG_GCCISH_LINK_FLAGS_i686-apple-darwin := -dynamiclib -pthread  -framework CoreServices -m32
++CFG_GCCISH_DEF_FLAG_i686-apple-darwin := -Wl,-exported_symbols_list,
++CFG_GCCISH_PRE_LIB_FLAGS_i686-apple-darwin :=
++CFG_GCCISH_POST_LIB_FLAGS_i686-apple-darwin :=
++CFG_DEF_SUFFIX_i686-apple-darwin := .darwin.def
++CFG_LLC_FLAGS_i686-apple-darwin :=
++CFG_INSTALL_NAME_i686-apple-darwin = -Wl,-install_name,@rpath/$(1)
++CFG_EXE_SUFFIX_i686-apple-darwin :=
++CFG_WINDOWSY_i686-apple-darwin :=
++CFG_UNIXY_i686-apple-darwin := 1
++CFG_PATH_MUNGE_i686-apple-darwin := true
++CFG_LDPATH_i686-apple-darwin :=
++CFG_RUN_i686-apple-darwin=$(2)
++CFG_RUN_TARG_i686-apple-darwin=$(call CFG_RUN_i686-apple-darwin,,$(2))
++CFG_GNU_TRIPLE_i686-apple-darwin := i686-apple-darwin
+diff --git a/mk/cfg/i686-pc-windows-gnu b/mk/cfg/i686-pc-windows-gnu
+deleted file mode 100644
+index ecb405b..0000000
+--- a/mk/cfg/i686-pc-windows-gnu
++++ /dev/null
+@@ -1,28 +0,0 @@
+-# i686-pc-windows-gnu configuration
+-CROSS_PREFIX_i686-pc-windows-gnu=i686-w64-mingw32-
+-CC_i686-pc-windows-gnu=gcc
+-CXX_i686-pc-windows-gnu=g++
+-CPP_i686-pc-windows-gnu=gcc -E
+-AR_i686-pc-windows-gnu=ar
+-CFG_LIB_NAME_i686-pc-windows-gnu=$(1).dll
+-CFG_STATIC_LIB_NAME_i686-pc-windows-gnu=$(1).lib
+-CFG_LIB_GLOB_i686-pc-windows-gnu=$(1)-*.dll
+-CFG_LIB_DSYM_GLOB_i686-pc-windows-gnu=$(1)-*.dylib.dSYM
+-CFG_JEMALLOC_CFLAGS_i686-pc-windows-gnu := -march=i686 -m32 -D_WIN32_WINNT=0x0600 $(CFLAGS)
+-CFG_GCCISH_CFLAGS_i686-pc-windows-gnu := -Wall -Werror -g -m32 -D_WIN32_WINNT=0x0600 $(CFLAGS)
+-CFG_GCCISH_CXXFLAGS_i686-pc-windows-gnu := -fno-rtti $(CXXFLAGS)
+-CFG_GCCISH_LINK_FLAGS_i686-pc-windows-gnu := -shared -g -m32
+-CFG_GCCISH_DEF_FLAG_i686-pc-windows-gnu :=
+-CFG_GCCISH_PRE_LIB_FLAGS_i686-pc-windows-gnu :=
+-CFG_GCCISH_POST_LIB_FLAGS_i686-pc-windows-gnu :=
+-CFG_DEF_SUFFIX_i686-pc-windows-gnu := .windows.def
+-CFG_LLC_FLAGS_i686-pc-windows-gnu :=
+-CFG_INSTALL_NAME_i686-pc-windows-gnu =
+-CFG_EXE_SUFFIX_i686-pc-windows-gnu := .exe
+-CFG_WINDOWSY_i686-pc-windows-gnu := 1
+-CFG_UNIXY_i686-pc-windows-gnu :=
+-CFG_PATH_MUNGE_i686-pc-windows-gnu :=
+-CFG_LDPATH_i686-pc-windows-gnu :=$(CFG_LDPATH_i686-pc-windows-gnu):$(PATH)
+-CFG_RUN_i686-pc-windows-gnu=PATH="$(CFG_LDPATH_i686-pc-windows-gnu):$(1)" $(2)
+-CFG_RUN_TARG_i686-pc-windows-gnu=$(call CFG_RUN_i686-pc-windows-gnu,$(HLIB$(1)_H_$(CFG_BUILD)),$(2))
+-CFG_GNU_TRIPLE_i686-pc-windows-gnu := i686-w64-mingw32
+diff --git a/mk/cfg/i686-pc-windows-gnu.mk b/mk/cfg/i686-pc-windows-gnu.mk
+new file mode 100644
+index 0000000..ecb405b
+--- /dev/null
++++ b/mk/cfg/i686-pc-windows-gnu.mk
+@@ -0,0 +1,28 @@
++# i686-pc-windows-gnu configuration
++CROSS_PREFIX_i686-pc-windows-gnu=i686-w64-mingw32-
++CC_i686-pc-windows-gnu=gcc
++CXX_i686-pc-windows-gnu=g++
++CPP_i686-pc-windows-gnu=gcc -E
++AR_i686-pc-windows-gnu=ar
++CFG_LIB_NAME_i686-pc-windows-gnu=$(1).dll
++CFG_STATIC_LIB_NAME_i686-pc-windows-gnu=$(1).lib
++CFG_LIB_GLOB_i686-pc-windows-gnu=$(1)-*.dll
++CFG_LIB_DSYM_GLOB_i686-pc-windows-gnu=$(1)-*.dylib.dSYM
++CFG_JEMALLOC_CFLAGS_i686-pc-windows-gnu := -march=i686 -m32 -D_WIN32_WINNT=0x0600 $(CFLAGS)
++CFG_GCCISH_CFLAGS_i686-pc-windows-gnu := -Wall -Werror -g -m32 -D_WIN32_WINNT=0x0600 $(CFLAGS)
++CFG_GCCISH_CXXFLAGS_i686-pc-windows-gnu := -fno-rtti $(CXXFLAGS)
++CFG_GCCISH_LINK_FLAGS_i686-pc-windows-gnu := -shared -g -m32
++CFG_GCCISH_DEF_FLAG_i686-pc-windows-gnu :=
++CFG_GCCISH_PRE_LIB_FLAGS_i686-pc-windows-gnu :=
++CFG_GCCISH_POST_LIB_FLAGS_i686-pc-windows-gnu :=
++CFG_DEF_SUFFIX_i686-pc-windows-gnu := .windows.def
++CFG_LLC_FLAGS_i686-pc-windows-gnu :=
++CFG_INSTALL_NAME_i686-pc-windows-gnu =
++CFG_EXE_SUFFIX_i686-pc-windows-gnu := .exe
++CFG_WINDOWSY_i686-pc-windows-gnu := 1
++CFG_UNIXY_i686-pc-windows-gnu :=
++CFG_PATH_MUNGE_i686-pc-windows-gnu :=
++CFG_LDPATH_i686-pc-windows-gnu :=$(CFG_LDPATH_i686-pc-windows-gnu):$(PATH)
++CFG_RUN_i686-pc-windows-gnu=PATH="$(CFG_LDPATH_i686-pc-windows-gnu):$(1)" $(2)
++CFG_RUN_TARG_i686-pc-windows-gnu=$(call CFG_RUN_i686-pc-windows-gnu,$(HLIB$(1)_H_$(CFG_BUILD)),$(2))
++CFG_GNU_TRIPLE_i686-pc-windows-gnu := i686-w64-mingw32
+diff --git a/mk/cfg/i686-unknown-linux-gnu b/mk/cfg/i686-unknown-linux-gnu
+deleted file mode 100644
+index 1cc9c14..0000000
+--- a/mk/cfg/i686-unknown-linux-gnu
++++ /dev/null
+@@ -1,27 +0,0 @@
+-# i686-unknown-linux-gnu configuration
+-CC_i686-unknown-linux-gnu=$(CC)
+-CXX_i686-unknown-linux-gnu=$(CXX)
+-CPP_i686-unknown-linux-gnu=$(CPP)
+-AR_i686-unknown-linux-gnu=$(AR)
+-CFG_LIB_NAME_i686-unknown-linux-gnu=lib$(1).so
+-CFG_STATIC_LIB_NAME_i686-unknown-linux-gnu=lib$(1).a
+-CFG_LIB_GLOB_i686-unknown-linux-gnu=lib$(1)-*.so
+-CFG_LIB_DSYM_GLOB_i686-unknown-linux-gnu=lib$(1)-*.dylib.dSYM
+-CFG_JEMALLOC_CFLAGS_i686-unknown-linux-gnu := -m32 $(CFLAGS)
+-CFG_GCCISH_CFLAGS_i686-unknown-linux-gnu := -Wall -Werror -g -fPIC -m32 $(CFLAGS)
+-CFG_GCCISH_CXXFLAGS_i686-unknown-linux-gnu := -fno-rtti $(CXXFLAGS)
+-CFG_GCCISH_LINK_FLAGS_i686-unknown-linux-gnu := -shared -fPIC -ldl -pthread  -lrt -g -m32
+-CFG_GCCISH_DEF_FLAG_i686-unknown-linux-gnu := -Wl,--export-dynamic,--dynamic-list=
+-CFG_GCCISH_PRE_LIB_FLAGS_i686-unknown-linux-gnu := -Wl,-whole-archive
+-CFG_GCCISH_POST_LIB_FLAGS_i686-unknown-linux-gnu := -Wl,-no-whole-archive
+-CFG_DEF_SUFFIX_i686-unknown-linux-gnu := .linux.def
+-CFG_LLC_FLAGS_i686-unknown-linux-gnu :=
+-CFG_INSTALL_NAME_i686-unknown-linux-gnu =
+-CFG_EXE_SUFFIX_i686-unknown-linux-gnu =
+-CFG_WINDOWSY_i686-unknown-linux-gnu :=
+-CFG_UNIXY_i686-unknown-linux-gnu := 1
+-CFG_PATH_MUNGE_i686-unknown-linux-gnu := true
+-CFG_LDPATH_i686-unknown-linux-gnu :=
+-CFG_RUN_i686-unknown-linux-gnu=$(2)
+-CFG_RUN_TARG_i686-unknown-linux-gnu=$(call CFG_RUN_i686-unknown-linux-gnu,,$(2))
+-CFG_GNU_TRIPLE_i686-unknown-linux-gnu := i686-unknown-linux-gnu
+diff --git a/mk/cfg/i686-unknown-linux-gnu.mk b/mk/cfg/i686-unknown-linux-gnu.mk
+new file mode 100644
+index 0000000..1cc9c14
+--- /dev/null
++++ b/mk/cfg/i686-unknown-linux-gnu.mk
+@@ -0,0 +1,27 @@
++# i686-unknown-linux-gnu configuration
++CC_i686-unknown-linux-gnu=$(CC)
++CXX_i686-unknown-linux-gnu=$(CXX)
++CPP_i686-unknown-linux-gnu=$(CPP)
++AR_i686-unknown-linux-gnu=$(AR)
++CFG_LIB_NAME_i686-unknown-linux-gnu=lib$(1).so
++CFG_STATIC_LIB_NAME_i686-unknown-linux-gnu=lib$(1).a
++CFG_LIB_GLOB_i686-unknown-linux-gnu=lib$(1)-*.so
++CFG_LIB_DSYM_GLOB_i686-unknown-linux-gnu=lib$(1)-*.dylib.dSYM
++CFG_JEMALLOC_CFLAGS_i686-unknown-linux-gnu := -m32 $(CFLAGS)
++CFG_GCCISH_CFLAGS_i686-unknown-linux-gnu := -Wall -Werror -g -fPIC -m32 $(CFLAGS)
++CFG_GCCISH_CXXFLAGS_i686-unknown-linux-gnu := -fno-rtti $(CXXFLAGS)
++CFG_GCCISH_LINK_FLAGS_i686-unknown-linux-gnu := -shared -fPIC -ldl -pthread  -lrt -g -m32
++CFG_GCCISH_DEF_FLAG_i686-unknown-linux-gnu := -Wl,--export-dynamic,--dynamic-list=
++CFG_GCCISH_PRE_LIB_FLAGS_i686-unknown-linux-gnu := -Wl,-whole-archive
++CFG_GCCISH_POST_LIB_FLAGS_i686-unknown-linux-gnu := -Wl,-no-whole-archive
++CFG_DEF_SUFFIX_i686-unknown-linux-gnu := .linux.def
++CFG_LLC_FLAGS_i686-unknown-linux-gnu :=
++CFG_INSTALL_NAME_i686-unknown-linux-gnu =
++CFG_EXE_SUFFIX_i686-unknown-linux-gnu =
++CFG_WINDOWSY_i686-unknown-linux-gnu :=
++CFG_UNIXY_i686-unknown-linux-gnu := 1
++CFG_PATH_MUNGE_i686-unknown-linux-gnu := true
++CFG_LDPATH_i686-unknown-linux-gnu :=
++CFG_RUN_i686-unknown-linux-gnu=$(2)
++CFG_RUN_TARG_i686-unknown-linux-gnu=$(call CFG_RUN_i686-unknown-linux-gnu,,$(2))
++CFG_GNU_TRIPLE_i686-unknown-linux-gnu := i686-unknown-linux-gnu
+diff --git a/mk/cfg/mips-unknown-linux-gnu b/mk/cfg/mips-unknown-linux-gnu
+deleted file mode 100644
+index c5d8496..0000000
+--- a/mk/cfg/mips-unknown-linux-gnu
++++ /dev/null
+@@ -1,28 +0,0 @@
+-# mips-unknown-linux-gnu configuration
+-CC_mips-unknown-linux-gnu=mips-linux-gnu-gcc
+-CXX_mips-unknown-linux-gnu=mips-linux-gnu-g++
+-CPP_mips-unknown-linux-gnu=mips-linux-gnu-gcc -E
+-AR_mips-unknown-linux-gnu=mips-linux-gnu-ar
+-CFG_LIB_NAME_mips-unknown-linux-gnu=lib$(1).so
+-CFG_STATIC_LIB_NAME_mips-unknown-linux-gnu=lib$(1).a
+-CFG_LIB_GLOB_mips-unknown-linux-gnu=lib$(1)-*.so
+-CFG_LIB_DSYM_GLOB_mips-unknown-linux-gnu=lib$(1)-*.dylib.dSYM
+-CFG_JEMALLOC_CFLAGS_mips-unknown-linux-gnu := -mips32r2 -msoft-float -mabi=32 -mno-compact-eh $(CFLAGS)
+-CFG_GCCISH_CFLAGS_mips-unknown-linux-gnu := -Wall -g -fPIC -mips32r2 -msoft-float -mabi=32 -mno-compact-eh $(CFLAGS)
+-CFG_GCCISH_CXXFLAGS_mips-unknown-linux-gnu := -fno-rtti $(CXXFLAGS)
+-CFG_GCCISH_LINK_FLAGS_mips-unknown-linux-gnu := -shared -fPIC -g -mips32r2 -msoft-float -mabi=32
+-CFG_GCCISH_DEF_FLAG_mips-unknown-linux-gnu := -Wl,--export-dynamic,--dynamic-list=
+-CFG_GCCISH_PRE_LIB_FLAGS_mips-unknown-linux-gnu := -Wl,-whole-archive
+-CFG_GCCISH_POST_LIB_FLAGS_mips-unknown-linux-gnu := -Wl,-no-whole-archive
+-CFG_DEF_SUFFIX_mips-unknown-linux-gnu := .linux.def
+-CFG_LLC_FLAGS_mips-unknown-linux-gnu :=
+-CFG_INSTALL_NAME_mips-unknown-linux-gnu =
+-CFG_EXE_SUFFIX_mips-unknown-linux-gnu :=
+-CFG_WINDOWSY_mips-unknown-linux-gnu :=
+-CFG_UNIXY_mips-unknown-linux-gnu := 1
+-CFG_PATH_MUNGE_mips-unknown-linux-gnu := true
+-CFG_LDPATH_mips-unknown-linux-gnu :=
+-CFG_RUN_mips-unknown-linux-gnu=
+-CFG_RUN_TARG_mips-unknown-linux-gnu=
+-RUSTC_FLAGS_mips-unknown-linux-gnu := -C target-cpu=mips32r2 -C target-feature="+mips32r2,+o32" -C soft-float
+-CFG_GNU_TRIPLE_mips-unknown-linux-gnu := mips-unknown-linux-gnu
+diff --git a/mk/cfg/mips-unknown-linux-gnu.mk b/mk/cfg/mips-unknown-linux-gnu.mk
+new file mode 100644
+index 0000000..c5d8496
+--- /dev/null
++++ b/mk/cfg/mips-unknown-linux-gnu.mk
+@@ -0,0 +1,28 @@
++# mips-unknown-linux-gnu configuration
++CC_mips-unknown-linux-gnu=mips-linux-gnu-gcc
++CXX_mips-unknown-linux-gnu=mips-linux-gnu-g++
++CPP_mips-unknown-linux-gnu=mips-linux-gnu-gcc -E
++AR_mips-unknown-linux-gnu=mips-linux-gnu-ar
++CFG_LIB_NAME_mips-unknown-linux-gnu=lib$(1).so
++CFG_STATIC_LIB_NAME_mips-unknown-linux-gnu=lib$(1).a
++CFG_LIB_GLOB_mips-unknown-linux-gnu=lib$(1)-*.so
++CFG_LIB_DSYM_GLOB_mips-unknown-linux-gnu=lib$(1)-*.dylib.dSYM
++CFG_JEMALLOC_CFLAGS_mips-unknown-linux-gnu := -mips32r2 -msoft-float -mabi=32 -mno-compact-eh $(CFLAGS)
++CFG_GCCISH_CFLAGS_mips-unknown-linux-gnu := -Wall -g -fPIC -mips32r2 -msoft-float -mabi=32 -mno-compact-eh $(CFLAGS)
++CFG_GCCISH_CXXFLAGS_mips-unknown-linux-gnu := -fno-rtti $(CXXFLAGS)
++CFG_GCCISH_LINK_FLAGS_mips-unknown-linux-gnu := -shared -fPIC -g -mips32r2 -msoft-float -mabi=32
++CFG_GCCISH_DEF_FLAG_mips-unknown-linux-gnu := -Wl,--export-dynamic,--dynamic-list=
++CFG_GCCISH_PRE_LIB_FLAGS_mips-unknown-linux-gnu := -Wl,-whole-archive
++CFG_GCCISH_POST_LIB_FLAGS_mips-unknown-linux-gnu := -Wl,-no-whole-archive
++CFG_DEF_SUFFIX_mips-unknown-linux-gnu := .linux.def
++CFG_LLC_FLAGS_mips-unknown-linux-gnu :=
++CFG_INSTALL_NAME_mips-unknown-linux-gnu =
++CFG_EXE_SUFFIX_mips-unknown-linux-gnu :=
++CFG_WINDOWSY_mips-unknown-linux-gnu :=
++CFG_UNIXY_mips-unknown-linux-gnu := 1
++CFG_PATH_MUNGE_mips-unknown-linux-gnu := true
++CFG_LDPATH_mips-unknown-linux-gnu :=
++CFG_RUN_mips-unknown-linux-gnu=
++CFG_RUN_TARG_mips-unknown-linux-gnu=
++RUSTC_FLAGS_mips-unknown-linux-gnu := -C target-cpu=mips32r2 -C target-feature="+mips32r2,+o32" -C soft-float
++CFG_GNU_TRIPLE_mips-unknown-linux-gnu := mips-unknown-linux-gnu
+diff --git a/mk/cfg/mipsel-unknown-linux-gnu b/mk/cfg/mipsel-unknown-linux-gnu
+deleted file mode 100644
+index eb2f300..0000000
+--- a/mk/cfg/mipsel-unknown-linux-gnu
++++ /dev/null
+@@ -1,28 +0,0 @@
+-# mipsel-unknown-linux-gnu configuration
+-CC_mipsel-unknown-linux-gnu=mipsel-unknown-linux-gnu-gcc
+-CXX_mipsel-unknown-linux-gnu=mipsel-unknown-linux-gnu-g++
+-CPP_mipsel-unknown-linux-gnu=mipsel-unknown-linux-gnu-gcc
+-AR_mipsel-unknown-linux-gnu=mipsel-unknown-linux-gnu-ar
+-CFG_LIB_NAME_mipsel-unknown-linux-gnu=lib$(1).so
+-CFG_STATIC_LIB_NAME_mipsel-unknown-linux-gnu=lib$(1).a
+-CFG_LIB_GLOB_mipsel-unknown-linux-gnu=lib$(1)-*.so
+-CFG_LIB_DSYM_GLOB_mipsel-unknown-linux-gnu=lib$(1)-*.dylib.dSYM
+-CFG_JEMALLOC_CFLAGS_mipsel-unknown-linux-gnu := -mips32 -mabi=32 $(CFLAGS)
+-CFG_GCCISH_CFLAGS_mipsel-unknown-linux-gnu := -Wall -g -fPIC -mips32 -mabi=32 $(CFLAGS)
+-CFG_GCCISH_CXXFLAGS_mipsel-unknown-linux-gnu := -fno-rtti $(CXXFLAGS)
+-CFG_GCCISH_LINK_FLAGS_mipsel-unknown-linux-gnu := -shared -fPIC -g -mips32
+-CFG_GCCISH_DEF_FLAG_mipsel-unknown-linux-gnu := -Wl,--export-dynamic,--dynamic-list=
+-CFG_GCCISH_PRE_LIB_FLAGS_mipsel-unknown-linux-gnu := -Wl,-whole-archive
+-CFG_GCCISH_POST_LIB_FLAGS_mipsel-unknown-linux-gnu := -Wl,-no-whole-archive
+-CFG_DEF_SUFFIX_mipsel-unknown-linux-gnu := .linux.def
+-CFG_LLC_FLAGS_mipsel-unknown-linux-gnu :=
+-CFG_INSTALL_NAME_mipsel-unknown-linux-gnu =
+-CFG_EXE_SUFFIX_mipsel-unknown-linux-gnu :=
+-CFG_WINDOWSY_mipsel-unknown-linux-gnu :=
+-CFG_UNIXY_mipsel-unknown-linux-gnu := 1
+-CFG_PATH_MUNGE_mipsel-unknown-linux-gnu := true
+-CFG_LDPATH_mipsel-unknown-linux-gnu :=
+-CFG_RUN_mipsel-unknown-linux-gnu=
+-CFG_RUN_TARG_mipsel-unknown-linux-gnu=
+-RUSTC_FLAGS_mipsel-unknown-linux-gnu := -C target-cpu=mips32 -C target-feature="+mips32,+o32"
+-CFG_GNU_TRIPLE_mipsel-unknown-linux-gnu := mipsel-unknown-linux-gnu
+diff --git a/mk/cfg/mipsel-unknown-linux-gnu.mk b/mk/cfg/mipsel-unknown-linux-gnu.mk
+new file mode 100644
+index 0000000..eb2f300
+--- /dev/null
++++ b/mk/cfg/mipsel-unknown-linux-gnu.mk
+@@ -0,0 +1,28 @@
++# mipsel-unknown-linux-gnu configuration
++CC_mipsel-unknown-linux-gnu=mipsel-unknown-linux-gnu-gcc
++CXX_mipsel-unknown-linux-gnu=mipsel-unknown-linux-gnu-g++
++CPP_mipsel-unknown-linux-gnu=mipsel-unknown-linux-gnu-gcc
++AR_mipsel-unknown-linux-gnu=mipsel-unknown-linux-gnu-ar
++CFG_LIB_NAME_mipsel-unknown-linux-gnu=lib$(1).so
++CFG_STATIC_LIB_NAME_mipsel-unknown-linux-gnu=lib$(1).a
++CFG_LIB_GLOB_mipsel-unknown-linux-gnu=lib$(1)-*.so
++CFG_LIB_DSYM_GLOB_mipsel-unknown-linux-gnu=lib$(1)-*.dylib.dSYM
++CFG_JEMALLOC_CFLAGS_mipsel-unknown-linux-gnu := -mips32 -mabi=32 $(CFLAGS)
++CFG_GCCISH_CFLAGS_mipsel-unknown-linux-gnu := -Wall -g -fPIC -mips32 -mabi=32 $(CFLAGS)
++CFG_GCCISH_CXXFLAGS_mipsel-unknown-linux-gnu := -fno-rtti $(CXXFLAGS)
++CFG_GCCISH_LINK_FLAGS_mipsel-unknown-linux-gnu := -shared -fPIC -g -mips32
++CFG_GCCISH_DEF_FLAG_mipsel-unknown-linux-gnu := -Wl,--export-dynamic,--dynamic-list=
++CFG_GCCISH_PRE_LIB_FLAGS_mipsel-unknown-linux-gnu := -Wl,-whole-archive
++CFG_GCCISH_POST_LIB_FLAGS_mipsel-unknown-linux-gnu := -Wl,-no-whole-archive
++CFG_DEF_SUFFIX_mipsel-unknown-linux-gnu := .linux.def
++CFG_LLC_FLAGS_mipsel-unknown-linux-gnu :=
++CFG_INSTALL_NAME_mipsel-unknown-linux-gnu =
++CFG_EXE_SUFFIX_mipsel-unknown-linux-gnu :=
++CFG_WINDOWSY_mipsel-unknown-linux-gnu :=
++CFG_UNIXY_mipsel-unknown-linux-gnu := 1
++CFG_PATH_MUNGE_mipsel-unknown-linux-gnu := true
++CFG_LDPATH_mipsel-unknown-linux-gnu :=
++CFG_RUN_mipsel-unknown-linux-gnu=
++CFG_RUN_TARG_mipsel-unknown-linux-gnu=
++RUSTC_FLAGS_mipsel-unknown-linux-gnu := -C target-cpu=mips32 -C target-feature="+mips32,+o32"
++CFG_GNU_TRIPLE_mipsel-unknown-linux-gnu := mipsel-unknown-linux-gnu
+diff --git a/mk/cfg/x86_64-apple-darwin b/mk/cfg/x86_64-apple-darwin
+deleted file mode 100644
+index dbd6754..0000000
+--- a/mk/cfg/x86_64-apple-darwin
++++ /dev/null
+@@ -1,27 +0,0 @@
+-# x86_64-apple-darwin configuration
+-CC_x86_64-apple-darwin=$(CC)
+-CXX_x86_64-apple-darwin=$(CXX)
+-CPP_x86_64-apple-darwin=$(CPP)
+-AR_x86_64-apple-darwin=$(AR)
+-CFG_LIB_NAME_x86_64-apple-darwin=lib$(1).dylib
+-CFG_STATIC_LIB_NAME_x86_64-apple-darwin=lib$(1).a
+-CFG_LIB_GLOB_x86_64-apple-darwin=lib$(1)-*.dylib
+-CFG_LIB_DSYM_GLOB_x86_64-apple-darwin=lib$(1)-*.dylib.dSYM
+-CFG_JEMALLOC_CFLAGS_x86_64-apple-darwin := -m64 -arch x86_64 $(CFLAGS)
+-CFG_GCCISH_CFLAGS_x86_64-apple-darwin := -Wall -Werror -g -fPIC -m64 -arch x86_64 $(CFLAGS)
+-CFG_GCCISH_CXXFLAGS_x86_64-apple-darwin := -fno-rtti $(CXXFLAGS)
+-CFG_GCCISH_LINK_FLAGS_x86_64-apple-darwin := -dynamiclib -pthread  -framework CoreServices -m64
+-CFG_GCCISH_DEF_FLAG_x86_64-apple-darwin := -Wl,-exported_symbols_list,
+-CFG_GCCISH_PRE_LIB_FLAGS_x86_64-apple-darwin :=
+-CFG_GCCISH_POST_LIB_FLAGS_x86_64-apple-darwin :=
+-CFG_DEF_SUFFIX_x86_64-apple-darwin := .darwin.def
+-CFG_LLC_FLAGS_x86_64-apple-darwin :=
+-CFG_INSTALL_NAME_x86_64-apple-darwin = -Wl,-install_name,@rpath/$(1)
+-CFG_EXE_SUFFIX_x86_64-apple-darwin :=
+-CFG_WINDOWSY_x86_64-apple-darwin :=
+-CFG_UNIXY_x86_64-apple-darwin := 1
+-CFG_PATH_MUNGE_x86_64-apple-darwin := true
+-CFG_LDPATH_x86_64-apple-darwin :=
+-CFG_RUN_x86_64-apple-darwin=$(2)
+-CFG_RUN_TARG_x86_64-apple-darwin=$(call CFG_RUN_x86_64-apple-darwin,,$(2))
+-CFG_GNU_TRIPLE_x86_64-apple-darwin := x86_64-apple-darwin
+diff --git a/mk/cfg/x86_64-apple-darwin.mk b/mk/cfg/x86_64-apple-darwin.mk
+new file mode 100644
+index 0000000..dbd6754
+--- /dev/null
++++ b/mk/cfg/x86_64-apple-darwin.mk
+@@ -0,0 +1,27 @@
++# x86_64-apple-darwin configuration
++CC_x86_64-apple-darwin=$(CC)
++CXX_x86_64-apple-darwin=$(CXX)
++CPP_x86_64-apple-darwin=$(CPP)
++AR_x86_64-apple-darwin=$(AR)
++CFG_LIB_NAME_x86_64-apple-darwin=lib$(1).dylib
++CFG_STATIC_LIB_NAME_x86_64-apple-darwin=lib$(1).a
++CFG_LIB_GLOB_x86_64-apple-darwin=lib$(1)-*.dylib
++CFG_LIB_DSYM_GLOB_x86_64-apple-darwin=lib$(1)-*.dylib.dSYM
++CFG_JEMALLOC_CFLAGS_x86_64-apple-darwin := -m64 -arch x86_64 $(CFLAGS)
++CFG_GCCISH_CFLAGS_x86_64-apple-darwin := -Wall -Werror -g -fPIC -m64 -arch x86_64 $(CFLAGS)
++CFG_GCCISH_CXXFLAGS_x86_64-apple-darwin := -fno-rtti $(CXXFLAGS)
++CFG_GCCISH_LINK_FLAGS_x86_64-apple-darwin := -dynamiclib -pthread  -framework CoreServices -m64
++CFG_GCCISH_DEF_FLAG_x86_64-apple-darwin := -Wl,-exported_symbols_list,
++CFG_GCCISH_PRE_LIB_FLAGS_x86_64-apple-darwin :=
++CFG_GCCISH_POST_LIB_FLAGS_x86_64-apple-darwin :=
++CFG_DEF_SUFFIX_x86_64-apple-darwin := .darwin.def
++CFG_LLC_FLAGS_x86_64-apple-darwin :=
++CFG_INSTALL_NAME_x86_64-apple-darwin = -Wl,-install_name,@rpath/$(1)
++CFG_EXE_SUFFIX_x86_64-apple-darwin :=
++CFG_WINDOWSY_x86_64-apple-darwin :=
++CFG_UNIXY_x86_64-apple-darwin := 1
++CFG_PATH_MUNGE_x86_64-apple-darwin := true
++CFG_LDPATH_x86_64-apple-darwin :=
++CFG_RUN_x86_64-apple-darwin=$(2)
++CFG_RUN_TARG_x86_64-apple-darwin=$(call CFG_RUN_x86_64-apple-darwin,,$(2))
++CFG_GNU_TRIPLE_x86_64-apple-darwin := x86_64-apple-darwin
+diff --git a/mk/cfg/x86_64-pc-windows-gnu b/mk/cfg/x86_64-pc-windows-gnu
+deleted file mode 100644
+index a23e292..0000000
+--- a/mk/cfg/x86_64-pc-windows-gnu
++++ /dev/null
+@@ -1,28 +0,0 @@
+-# x86_64-pc-windows-gnu configuration
+-CROSS_PREFIX_x86_64-pc-windows-gnu=x86_64-w64-mingw32-
+-CC_x86_64-pc-windows-gnu=gcc
+-CXX_x86_64-pc-windows-gnu=g++
+-CPP_x86_64-pc-windows-gnu=gcc -E
+-AR_x86_64-pc-windows-gnu=ar
+-CFG_LIB_NAME_x86_64-pc-windows-gnu=$(1).dll
+-CFG_STATIC_LIB_NAME_x86_64-pc-windows-gnu=$(1).lib
+-CFG_LIB_GLOB_x86_64-pc-windows-gnu=$(1)-*.dll
+-CFG_LIB_DSYM_GLOB_x86_64-pc-windows-gnu=$(1)-*.dylib.dSYM
+-CFG_JEMALLOC_CFLAGS_x86_64-pc-windows-gnu := -m64 -D_WIN32_WINNT=0x0600 $(CFLAGS)
+-CFG_GCCISH_CFLAGS_x86_64-pc-windows-gnu := -Wall -Werror -g -m64 -D_WIN32_WINNT=0x0600 $(CFLAGS)
+-CFG_GCCISH_CXXFLAGS_x86_64-pc-windows-gnu := -fno-rtti $(CXXFLAGS)
+-CFG_GCCISH_LINK_FLAGS_x86_64-pc-windows-gnu := -shared -g -m64
+-CFG_GCCISH_DEF_FLAG_x86_64-pc-windows-gnu :=
+-CFG_GCCISH_PRE_LIB_FLAGS_x86_64-pc-windows-gnu :=
+-CFG_GCCISH_POST_LIB_FLAGS_x86_64-pc-windows-gnu :=
+-CFG_DEF_SUFFIX_x86_64-pc-windows-gnu := .windows.def
+-CFG_LLC_FLAGS_x86_64-pc-windows-gnu :=
+-CFG_INSTALL_NAME_x86_64-pc-windows-gnu =
+-CFG_EXE_SUFFIX_x86_64-pc-windows-gnu := .exe
+-CFG_WINDOWSY_x86_64-pc-windows-gnu := 1
+-CFG_UNIXY_x86_64-pc-windows-gnu :=
+-CFG_PATH_MUNGE_x86_64-pc-windows-gnu :=
+-CFG_LDPATH_x86_64-pc-windows-gnu :=$(CFG_LDPATH_x86_64-pc-windows-gnu):$(PATH)
+-CFG_RUN_x86_64-pc-windows-gnu=PATH="$(CFG_LDPATH_x86_64-pc-windows-gnu):$(1)" $(2)
+-CFG_RUN_TARG_x86_64-pc-windows-gnu=$(call CFG_RUN_x86_64-pc-windows-gnu,$(HLIB$(1)_H_$(CFG_BUILD)),$(2))
+-CFG_GNU_TRIPLE_x86_64-pc-windows-gnu := x86_64-w64-mingw32
+diff --git a/mk/cfg/x86_64-pc-windows-gnu.mk b/mk/cfg/x86_64-pc-windows-gnu.mk
+new file mode 100644
+index 0000000..a23e292
+--- /dev/null
++++ b/mk/cfg/x86_64-pc-windows-gnu.mk
+@@ -0,0 +1,28 @@
++# x86_64-pc-windows-gnu configuration
++CROSS_PREFIX_x86_64-pc-windows-gnu=x86_64-w64-mingw32-
++CC_x86_64-pc-windows-gnu=gcc
++CXX_x86_64-pc-windows-gnu=g++
++CPP_x86_64-pc-windows-gnu=gcc -E
++AR_x86_64-pc-windows-gnu=ar
++CFG_LIB_NAME_x86_64-pc-windows-gnu=$(1).dll
++CFG_STATIC_LIB_NAME_x86_64-pc-windows-gnu=$(1).lib
++CFG_LIB_GLOB_x86_64-pc-windows-gnu=$(1)-*.dll
++CFG_LIB_DSYM_GLOB_x86_64-pc-windows-gnu=$(1)-*.dylib.dSYM
++CFG_JEMALLOC_CFLAGS_x86_64-pc-windows-gnu := -m64 -D_WIN32_WINNT=0x0600 $(CFLAGS)
++CFG_GCCISH_CFLAGS_x86_64-pc-windows-gnu := -Wall -Werror -g -m64 -D_WIN32_WINNT=0x0600 $(CFLAGS)
++CFG_GCCISH_CXXFLAGS_x86_64-pc-windows-gnu := -fno-rtti $(CXXFLAGS)
++CFG_GCCISH_LINK_FLAGS_x86_64-pc-windows-gnu := -shared -g -m64
++CFG_GCCISH_DEF_FLAG_x86_64-pc-windows-gnu :=
++CFG_GCCISH_PRE_LIB_FLAGS_x86_64-pc-windows-gnu :=
++CFG_GCCISH_POST_LIB_FLAGS_x86_64-pc-windows-gnu :=
++CFG_DEF_SUFFIX_x86_64-pc-windows-gnu := .windows.def
++CFG_LLC_FLAGS_x86_64-pc-windows-gnu :=
++CFG_INSTALL_NAME_x86_64-pc-windows-gnu =
++CFG_EXE_SUFFIX_x86_64-pc-windows-gnu := .exe
++CFG_WINDOWSY_x86_64-pc-windows-gnu := 1
++CFG_UNIXY_x86_64-pc-windows-gnu :=
++CFG_PATH_MUNGE_x86_64-pc-windows-gnu :=
++CFG_LDPATH_x86_64-pc-windows-gnu :=$(CFG_LDPATH_x86_64-pc-windows-gnu):$(PATH)
++CFG_RUN_x86_64-pc-windows-gnu=PATH="$(CFG_LDPATH_x86_64-pc-windows-gnu):$(1)" $(2)
++CFG_RUN_TARG_x86_64-pc-windows-gnu=$(call CFG_RUN_x86_64-pc-windows-gnu,$(HLIB$(1)_H_$(CFG_BUILD)),$(2))
++CFG_GNU_TRIPLE_x86_64-pc-windows-gnu := x86_64-w64-mingw32
+diff --git a/mk/cfg/x86_64-unknown-dragonfly b/mk/cfg/x86_64-unknown-dragonfly
+deleted file mode 100644
+index 05414c7..0000000
+--- a/mk/cfg/x86_64-unknown-dragonfly
++++ /dev/null
+@@ -1,26 +0,0 @@
+-# x86_64-pc-dragonfly-elf configuration
+-CC_x86_64-unknown-dragonfly=$(CC)
+-CXX_x86_64-unknown-dragonfly=$(CXX)
+-CPP_x86_64-unknown-dragonfly=$(CPP)
+-AR_x86_64-unknown-dragonfly=$(AR)
+-CFG_LIB_NAME_x86_64-unknown-dragonfly=lib$(1).so
+-CFG_STATIC_LIB_NAME_x86_64-unknown-dragonfly=lib$(1).a
+-CFG_LIB_GLOB_x86_64-unknown-dragonfly=lib$(1)-*.so
+-CFG_LIB_DSYM_GLOB_x86_64-unknown-dragonfly=$(1)-*.dylib.dSYM
+-CFG_JEMALLOC_CFLAGS_x86_64-unknown-dragonfly := -I/usr/include -I/usr/local/include $(CFLAGS)
+-CFG_GCCISH_CFLAGS_x86_64-unknown-dragonfly := -Wall -Werror -g -fPIC -I/usr/include -I/usr/local/include $(CFLAGS)
+-CFG_GCCISH_LINK_FLAGS_x86_64-unknown-dragonfly := -shared -fPIC -g -pthread  -lrt
+-CFG_GCCISH_DEF_FLAG_x86_64-unknown-dragonfly := -Wl,--export-dynamic,--dynamic-list=
+-CFG_GCCISH_PRE_LIB_FLAGS_x86_64-unknown-dragonfly := -Wl,-whole-archive
+-CFG_GCCISH_POST_LIB_FLAGS_x86_64-unknown-dragonfly := -Wl,-no-whole-archive
+-CFG_DEF_SUFFIX_x86_64-unknown-dragonfly := .bsd.def
+-CFG_LLC_FLAGS_x86_64-unknown-dragonfly :=
+-CFG_INSTALL_NAME_x86_64-unknown-dragonfly =
+-CFG_EXE_SUFFIX_x86_64-unknown-dragonfly :=
+-CFG_WINDOWSY_x86_64-unknown-dragonfly :=
+-CFG_UNIXY_x86_64-unknown-dragonfly := 1
+-CFG_PATH_MUNGE_x86_64-unknown-dragonfly :=
+-CFG_LDPATH_x86_64-unknown-dragonfly :=
+-CFG_RUN_x86_64-unknown-dragonfly=$(2)
+-CFG_RUN_TARG_x86_64-unknown-dragonfly=$(call CFG_RUN_x86_64-unknown-dragonfly,,$(2))
+-CFG_GNU_TRIPLE_x86_64-unknown-dragonfly := x86_64-unknown-dragonfly
+diff --git a/mk/cfg/x86_64-unknown-dragonfly.mk b/mk/cfg/x86_64-unknown-dragonfly.mk
+new file mode 100644
+index 0000000..05414c7
+--- /dev/null
++++ b/mk/cfg/x86_64-unknown-dragonfly.mk
+@@ -0,0 +1,26 @@
++# x86_64-pc-dragonfly-elf configuration
++CC_x86_64-unknown-dragonfly=$(CC)
++CXX_x86_64-unknown-dragonfly=$(CXX)
++CPP_x86_64-unknown-dragonfly=$(CPP)
++AR_x86_64-unknown-dragonfly=$(AR)
++CFG_LIB_NAME_x86_64-unknown-dragonfly=lib$(1).so
++CFG_STATIC_LIB_NAME_x86_64-unknown-dragonfly=lib$(1).a
++CFG_LIB_GLOB_x86_64-unknown-dragonfly=lib$(1)-*.so
++CFG_LIB_DSYM_GLOB_x86_64-unknown-dragonfly=$(1)-*.dylib.dSYM
++CFG_JEMALLOC_CFLAGS_x86_64-unknown-dragonfly := -I/usr/include -I/usr/local/include $(CFLAGS)
++CFG_GCCISH_CFLAGS_x86_64-unknown-dragonfly := -Wall -Werror -g -fPIC -I/usr/include -I/usr/local/include $(CFLAGS)
++CFG_GCCISH_LINK_FLAGS_x86_64-unknown-dragonfly := -shared -fPIC -g -pthread  -lrt
++CFG_GCCISH_DEF_FLAG_x86_64-unknown-dragonfly := -Wl,--export-dynamic,--dynamic-list=
++CFG_GCCISH_PRE_LIB_FLAGS_x86_64-unknown-dragonfly := -Wl,-whole-archive
++CFG_GCCISH_POST_LIB_FLAGS_x86_64-unknown-dragonfly := -Wl,-no-whole-archive
++CFG_DEF_SUFFIX_x86_64-unknown-dragonfly := .bsd.def
++CFG_LLC_FLAGS_x86_64-unknown-dragonfly :=
++CFG_INSTALL_NAME_x86_64-unknown-dragonfly =
++CFG_EXE_SUFFIX_x86_64-unknown-dragonfly :=
++CFG_WINDOWSY_x86_64-unknown-dragonfly :=
++CFG_UNIXY_x86_64-unknown-dragonfly := 1
++CFG_PATH_MUNGE_x86_64-unknown-dragonfly :=
++CFG_LDPATH_x86_64-unknown-dragonfly :=
++CFG_RUN_x86_64-unknown-dragonfly=$(2)
++CFG_RUN_TARG_x86_64-unknown-dragonfly=$(call CFG_RUN_x86_64-unknown-dragonfly,,$(2))
++CFG_GNU_TRIPLE_x86_64-unknown-dragonfly := x86_64-unknown-dragonfly
+diff --git a/mk/cfg/x86_64-unknown-freebsd b/mk/cfg/x86_64-unknown-freebsd
+deleted file mode 100644
+index 4e847ea..0000000
+--- a/mk/cfg/x86_64-unknown-freebsd
++++ /dev/null
+@@ -1,26 +0,0 @@
+-# x86_64-unknown-freebsd configuration
+-CC_x86_64-unknown-freebsd=$(CC)
+-CXX_x86_64-unknown-freebsd=$(CXX)
+-CPP_x86_64-unknown-freebsd=$(CPP)
+-AR_x86_64-unknown-freebsd=$(AR)
+-CFG_LIB_NAME_x86_64-unknown-freebsd=lib$(1).so
+-CFG_STATIC_LIB_NAME_x86_64-unknown-freebsd=lib$(1).a
+-CFG_LIB_GLOB_x86_64-unknown-freebsd=lib$(1)-*.so
+-CFG_LIB_DSYM_GLOB_x86_64-unknown-freebsd=$(1)-*.dylib.dSYM
+-CFG_JEMALLOC_CFLAGS_x86_64-unknown-freebsd := -I/usr/local/include $(CFLAGS)
+-CFG_GCCISH_CFLAGS_x86_64-unknown-freebsd := -Wall -Werror -g -fPIC -I/usr/local/include $(CFLAGS)
+-CFG_GCCISH_LINK_FLAGS_x86_64-unknown-freebsd := -shared -fPIC -g -pthread  -lrt
+-CFG_GCCISH_DEF_FLAG_x86_64-unknown-freebsd := -Wl,--export-dynamic,--dynamic-list=
+-CFG_GCCISH_PRE_LIB_FLAGS_x86_64-unknown-freebsd := -Wl,-whole-archive
+-CFG_GCCISH_POST_LIB_FLAGS_x86_64-unknown-freebsd := -Wl,-no-whole-archive
+-CFG_DEF_SUFFIX_x86_64-unknown-freebsd := .bsd.def
+-CFG_LLC_FLAGS_x86_64-unknown-freebsd :=
+-CFG_INSTALL_NAME_x86_64-unknown-freebsd =
+-CFG_EXE_SUFFIX_x86_64-unknown-freebsd :=
+-CFG_WINDOWSY_x86_64-unknown-freebsd :=
+-CFG_UNIXY_x86_64-unknown-freebsd := 1
+-CFG_PATH_MUNGE_x86_64-unknown-freebsd :=
+-CFG_LDPATH_x86_64-unknown-freebsd :=
+-CFG_RUN_x86_64-unknown-freebsd=$(2)
+-CFG_RUN_TARG_x86_64-unknown-freebsd=$(call CFG_RUN_x86_64-unknown-freebsd,,$(2))
+-CFG_GNU_TRIPLE_x86_64-unknown-freebsd := x86_64-unknown-freebsd
+diff --git a/mk/cfg/x86_64-unknown-freebsd.mk b/mk/cfg/x86_64-unknown-freebsd.mk
+new file mode 100644
+index 0000000..4e847ea
+--- /dev/null
++++ b/mk/cfg/x86_64-unknown-freebsd.mk
+@@ -0,0 +1,26 @@
++# x86_64-unknown-freebsd configuration
++CC_x86_64-unknown-freebsd=$(CC)
++CXX_x86_64-unknown-freebsd=$(CXX)
++CPP_x86_64-unknown-freebsd=$(CPP)
++AR_x86_64-unknown-freebsd=$(AR)
++CFG_LIB_NAME_x86_64-unknown-freebsd=lib$(1).so
++CFG_STATIC_LIB_NAME_x86_64-unknown-freebsd=lib$(1).a
++CFG_LIB_GLOB_x86_64-unknown-freebsd=lib$(1)-*.so
++CFG_LIB_DSYM_GLOB_x86_64-unknown-freebsd=$(1)-*.dylib.dSYM
++CFG_JEMALLOC_CFLAGS_x86_64-unknown-freebsd := -I/usr/local/include $(CFLAGS)
++CFG_GCCISH_CFLAGS_x86_64-unknown-freebsd := -Wall -Werror -g -fPIC -I/usr/local/include $(CFLAGS)
++CFG_GCCISH_LINK_FLAGS_x86_64-unknown-freebsd := -shared -fPIC -g -pthread  -lrt
++CFG_GCCISH_DEF_FLAG_x86_64-unknown-freebsd := -Wl,--export-dynamic,--dynamic-list=
++CFG_GCCISH_PRE_LIB_FLAGS_x86_64-unknown-freebsd := -Wl,-whole-archive
++CFG_GCCISH_POST_LIB_FLAGS_x86_64-unknown-freebsd := -Wl,-no-whole-archive
++CFG_DEF_SUFFIX_x86_64-unknown-freebsd := .bsd.def
++CFG_LLC_FLAGS_x86_64-unknown-freebsd :=
++CFG_INSTALL_NAME_x86_64-unknown-freebsd =
++CFG_EXE_SUFFIX_x86_64-unknown-freebsd :=
++CFG_WINDOWSY_x86_64-unknown-freebsd :=
++CFG_UNIXY_x86_64-unknown-freebsd := 1
++CFG_PATH_MUNGE_x86_64-unknown-freebsd :=
++CFG_LDPATH_x86_64-unknown-freebsd :=
++CFG_RUN_x86_64-unknown-freebsd=$(2)
++CFG_RUN_TARG_x86_64-unknown-freebsd=$(call CFG_RUN_x86_64-unknown-freebsd,,$(2))
++CFG_GNU_TRIPLE_x86_64-unknown-freebsd := x86_64-unknown-freebsd
+diff --git a/mk/cfg/x86_64-unknown-linux-gnu b/mk/cfg/x86_64-unknown-linux-gnu
+deleted file mode 100644
+index 845f9c1..0000000
+--- a/mk/cfg/x86_64-unknown-linux-gnu
++++ /dev/null
+@@ -1,28 +0,0 @@
+-# x86_64-unknown-linux-gnu configuration
+-CC_x86_64-unknown-linux-gnu=$(CC)
+-CXX_x86_64-unknown-linux-gnu=$(CXX)
+-CPP_x86_64-unknown-linux-gnu=$(CPP)
+-AR_x86_64-unknown-linux-gnu=$(AR)
+-CFG_LIB_NAME_x86_64-unknown-linux-gnu=lib$(1).so
+-CFG_STATIC_LIB_NAME_x86_64-unknown-linux-gnu=lib$(1).a
+-CFG_LIB_GLOB_x86_64-unknown-linux-gnu=lib$(1)-*.so
+-CFG_LIB_DSYM_GLOB_x86_64-unknown-linux-gnu=lib$(1)-*.dylib.dSYM
+-CFG_JEMALLOC_CFLAGS_x86_64-unknown-linux-gnu := -m64
+-CFG_GCCISH_CFLAGS_x86_64-unknown-linux-gnu := -Wall -Werror -g -fPIC -m64
+-CFG_GCCISH_CXXFLAGS_x86_64-unknown-linux-gnu := -fno-rtti
+-CFG_GCCISH_LINK_FLAGS_x86_64-unknown-linux-gnu := -shared -fPIC -ldl -pthread  -lrt -g -m64
+-CFG_GCCISH_DEF_FLAG_x86_64-unknown-linux-gnu := -Wl,--export-dynamic,--dynamic-list=
+-CFG_GCCISH_PRE_LIB_FLAGS_x86_64-unknown-linux-gnu := -Wl,-whole-archive
+-CFG_GCCISH_POST_LIB_FLAGS_x86_64-unknown-linux-gnu := -Wl,-no-whole-archive
+-CFG_DEF_SUFFIX_x86_64-unknown-linux-gnu := .linux.def
+-CFG_LLC_FLAGS_x86_64-unknown-linux-gnu :=
+-CFG_INSTALL_NAME_x86_64-unknown-linux-gnu =
+-CFG_EXE_SUFFIX_x86_64-unknown-linux-gnu =
+-CFG_WINDOWSY_x86_64-unknown-linux-gnu :=
+-CFG_UNIXY_x86_64-unknown-linux-gnu := 1
+-CFG_PATH_MUNGE_x86_64-unknown-linux-gnu := true
+-CFG_LDPATH_x86_64-unknown-linux-gnu :=
+-CFG_RUN_x86_64-unknown-linux-gnu=$(2)
+-CFG_RUN_TARG_x86_64-unknown-linux-gnu=$(call CFG_RUN_x86_64-unknown-linux-gnu,,$(2))
+-CFG_GNU_TRIPLE_x86_64-unknown-linux-gnu := x86_64-unknown-linux-gnu
+-
+diff --git a/mk/cfg/x86_64-unknown-linux-gnu.mk b/mk/cfg/x86_64-unknown-linux-gnu.mk
+new file mode 100644
+index 0000000..845f9c1
+--- /dev/null
++++ b/mk/cfg/x86_64-unknown-linux-gnu.mk
+@@ -0,0 +1,28 @@
++# x86_64-unknown-linux-gnu configuration
++CC_x86_64-unknown-linux-gnu=$(CC)
++CXX_x86_64-unknown-linux-gnu=$(CXX)
++CPP_x86_64-unknown-linux-gnu=$(CPP)
++AR_x86_64-unknown-linux-gnu=$(AR)
++CFG_LIB_NAME_x86_64-unknown-linux-gnu=lib$(1).so
++CFG_STATIC_LIB_NAME_x86_64-unknown-linux-gnu=lib$(1).a
++CFG_LIB_GLOB_x86_64-unknown-linux-gnu=lib$(1)-*.so
++CFG_LIB_DSYM_GLOB_x86_64-unknown-linux-gnu=lib$(1)-*.dylib.dSYM
++CFG_JEMALLOC_CFLAGS_x86_64-unknown-linux-gnu := -m64
++CFG_GCCISH_CFLAGS_x86_64-unknown-linux-gnu := -Wall -Werror -g -fPIC -m64
++CFG_GCCISH_CXXFLAGS_x86_64-unknown-linux-gnu := -fno-rtti
++CFG_GCCISH_LINK_FLAGS_x86_64-unknown-linux-gnu := -shared -fPIC -ldl -pthread  -lrt -g -m64
++CFG_GCCISH_DEF_FLAG_x86_64-unknown-linux-gnu := -Wl,--export-dynamic,--dynamic-list=
++CFG_GCCISH_PRE_LIB_FLAGS_x86_64-unknown-linux-gnu := -Wl,-whole-archive
++CFG_GCCISH_POST_LIB_FLAGS_x86_64-unknown-linux-gnu := -Wl,-no-whole-archive
++CFG_DEF_SUFFIX_x86_64-unknown-linux-gnu := .linux.def
++CFG_LLC_FLAGS_x86_64-unknown-linux-gnu :=
++CFG_INSTALL_NAME_x86_64-unknown-linux-gnu =
++CFG_EXE_SUFFIX_x86_64-unknown-linux-gnu =
++CFG_WINDOWSY_x86_64-unknown-linux-gnu :=
++CFG_UNIXY_x86_64-unknown-linux-gnu := 1
++CFG_PATH_MUNGE_x86_64-unknown-linux-gnu := true
++CFG_LDPATH_x86_64-unknown-linux-gnu :=
++CFG_RUN_x86_64-unknown-linux-gnu=$(2)
++CFG_RUN_TARG_x86_64-unknown-linux-gnu=$(call CFG_RUN_x86_64-unknown-linux-gnu,,$(2))
++CFG_GNU_TRIPLE_x86_64-unknown-linux-gnu := x86_64-unknown-linux-gnu
++
+diff --git a/mk/platform.mk b/mk/platform.mk
+index 6da01ef..6979dd7 100644
+--- 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
+@@ -196,6 +196,10 @@ define CFG_MAKE_TOOLCHAIN
+ 
+   endif
+ 
++show-cc-$(1):
++	@echo "CC=$$(CC_$(1))"
++	@echo "CROSS_PREFIX=$$(CROSS_PREFIX_$(1))"
++
+ endef
+ 
+ $(foreach target,$(CFG_TARGET), \
+-- 
+2.1.3
+
diff --git a/recipes/rust/files/0033-mk-instead-of-lieing-about-stage0-libdir-pass-flags-.patch b/recipes/rust/files/0033-mk-instead-of-lieing-about-stage0-libdir-pass-flags-.patch
new file mode 100644
index 0000000..4112d5e
--- /dev/null
+++ b/recipes/rust/files/0033-mk-instead-of-lieing-about-stage0-libdir-pass-flags-.patch
@@ -0,0 +1,47 @@
+From 77db00da6b4c11214461ee17288ac3b12c4cc950 Mon Sep 17 00:00:00 2001
+From: Cody P Schafer <dev@codyps.com>
+Date: Wed, 19 Nov 2014 13:58:57 -0500
+Subject: [PATCH] mk: instead of lieing about stage0 libdir, pass flags to the
+ compiler to force the right libdirs
+
+---
+ mk/main.mk   | 14 ++++++++++++--
+ mk/target.mk |  1 +
+ 2 files changed, 13 insertions(+), 2 deletions(-)
+
+diff --git a/mk/main.mk b/mk/main.mk
+index 676ea21..3e070c2 100644
+--- a/mk/main.mk
++++ b/mk/main.mk
+@@ -340,17 +340,26 @@ ifeq ($(1)-$(3),0-$$(CFG_BUILD))
+ # libdir. At the moment, this assumes the relative paths (from sysroot aka
+ # prefix) are 'lib' and 'bin'.
+ HBIN$(1)_H_$(3) = $$(HROOT$(1)_H_$(3))/bin
+-HLIB$(1)_H_$(3) = $$(HROOT$(1)_H_$(3))/lib
+ else
+ HBIN$(1)_H_$(3) = $$(HROOT$(1)_H_$(3))/$$(CFG_BINDIR_RELATIVE)
+-HLIB$(1)_H_$(3) = $$(HROOT$(1)_H_$(3))/$$(CFG_LIBDIR_RELATIVE)
+ endif
+ 
++HLIB$(1)_H_$(3) = $$(HROOT$(1)_H_$(3))/$$(CFG_LIBDIR_RELATIVE)
++
+ # Destinations of artifacts for target architectures
+ TROOT$(1)_T_$(2)_H_$(3) = $$(HLIB$(1)_H_$(3))/rustlib/$(2)
+ TBIN$(1)_T_$(2)_H_$(3) = $$(TROOT$(1)_T_$(2)_H_$(3))/bin
+ TLIB$(1)_T_$(2)_H_$(3) = $$(TROOT$(1)_T_$(2)_H_$(3))/lib
+ 
++# Don't trust stage0, be explicit about libraries
++# TODO: rather than specifying sysroot, we really want to tell which libdir to
++#       use (ie: the dir containing 'rustlib'). This would allow us to avoid
++#       passing the '-L' options.
++ifeq ($(1), 0)
++RUSTFLAGS_S_$(1)_T_$(2)_H_$(3) += --sysroot "$$(HROOT$(1)_H_$(3))" \
++				  -L "$$(TLIB$(1)_T_$(2)_H_$(3)"
++endif
++
+ # Preqrequisites for using the stageN compiler
+ ifeq ($(1),0)
+ HSREQ$(1)_H_$(3) = $$(HBIN$(1)_H_$(3))/rustc$$(X_$(3))
+-- 
+2.1.3
+
diff --git a/recipes/rust/rust_0.12.0+2014-11-18.bb b/recipes/rust/rust_0.12.0+2014-11-18.bb
index b9e6ac8..7eddb7a 100644
--- a/recipes/rust/rust_0.12.0+2014-11-18.bb
+++ b/recipes/rust/rust_0.12.0+2014-11-18.bb
@@ -15,4 +15,5 @@ SRC_URI_append = "\
 	file://0028-rustdoc-avoid-supplying-a-bad-default-sysroot-so-the.patch \
 	file://0030-Target-add-default-target.json-path-libdir-rust-targ.patch \
 	file://0031-mk-cfg-add-.mk-suffix-on-files-to-avoid-supprises-wh.patch \
+	file://0033-mk-instead-of-lieing-about-stage0-libdir-pass-flags-.patch \
 "
diff --git a/recipes/rust/rust_0.12.0+2014-11-19.bb b/recipes/rust/rust_0.12.0+2014-11-19.bb
new file mode 100644
index 0000000..3e74386
--- /dev/null
+++ b/recipes/rust/rust_0.12.0+2014-11-19.bb
@@ -0,0 +1,20 @@
+SRCREV = "bfaa7bcab3459907014c31d3bf980f65ccd14b08"
+require rust-git.inc
+
+SRC_URI_append = "\
+	file://0001-platform.mk-avoid-choking-on-i586.patch \
+	file://0007-mk-rt-compiler_rt-pass-LDFLAGS-from-CFG_GCCISH_LINK_.patch \
+	file://0030-Target-add-default-target.json-path-libdir-rust-targ.patch \
+	file://0031-mk-cfg-add-.mk-suffix-on-files-to-avoid-supprises-wh.patch \
+	\
+	file://0020-Support-bindir.patch \
+	file://0021-Remember-relative-libdir-and-bindir-from-build-time.patch \
+	file://0022-mk-add-missing-CFG_BINDIR_RELATIVE-uses.patch \
+	file://0023-mk-add-missing-CFG_LIBDIR_RELATIVE.patch \
+	file://0024-configure-CFG_-DIR_RELATIVE-avoid-requiring-existenc.patch \
+	file://0025-mk-add-rule-to-create-bindir.patch \
+	file://0026-mk-always-use-bin-as-bindir-for-stage0-CFG_BUILD-and.patch \
+	file://0027-mk-stage0-complain-instead-of-creating-an-empty-file.patch \
+	file://0028-mk-target-fix-typo-so-we-depend-on-the-correct-direc.patch \
+	file://0029-rustdoc-avoid-supplying-a-bad-default-sysroot-so-the.patch \
+"