diff --git a/sdk_container/src/third_party/coreos-overlay/dev-libs/rustlib/Manifest b/sdk_container/src/third_party/coreos-overlay/dev-libs/rustlib/Manifest
index ac8292b06d..3fe45ad568 100644
--- a/sdk_container/src/third_party/coreos-overlay/dev-libs/rustlib/Manifest
+++ b/sdk_container/src/third_party/coreos-overlay/dev-libs/rustlib/Manifest
@@ -1,5 +1 @@
-DIST cmake-0.1.24.crate 11525 SHA256 b8ebbb35d3dc9cd09497168f33de1acb79b265d350ab0ac34133b98f8509af1f SHA512 e8191d4f6b1474cb02fb66d2c32bd6a49c052bb91169a6091623a288f751a7ed595e4b07676c82687fc7fb55850631ff26a50016c56acdc0f74fa31b6a17ab84 WHIRLPOOL ab630d413b7550b9f864071e2fba729586429faee68ad52ac2c5a91b8adedd83c00d0b461601761bf5f0f179eb19a67e5f7f8a5d8390ec422bf110ed4b7540b0
-DIST filetime-0.1.10.crate 8884 SHA256 5363ab8e4139b8568a6237db5248646e5a8a2f89bd5ccb02092182b11fd3e922 SHA512 19245d71f60f144828adb6f9336adc5371e559decc8740338122327d28b7c548d011d9e6454b12475f0eb2db7dacdb1e2bfbef01311f59e8338f44d27c3345eb WHIRLPOOL 2af8d65033a9cef609d6688a32953c8ec9ac591ed6c357b62f86a028124d1a0c50199daadf839079771c00b4201971bacecc3928094fd77f9d4c872be8e01c10
-DIST gcc-0.3.51.crate 33348 SHA256 120d07f202dcc3f72859422563522b66fe6463a4c513df062874daad05f85f0a SHA512 0759969001bcc8104fb66beb7c42248d583a857d6b06bf6eb00e4ac1f72f63e1ec6a314f4a67a5d6c4b788eb6c891b98dd76dbf6f72dd74f8b33ab56087ca9a3 WHIRLPOOL 673f1b75f7e0cd8349f24659ffc4d8e1d6cfe64d52b30538902576c6b3b1732caeee7f9ab025400a12fca012eb6ad71b62950dc167cbd513a162e71fae4f99ff
-DIST libc-0.2.26.crate 171187 SHA256 30885bcb161cf67054244d10d4a7f4835ffd58773bc72e07d35fecf472295503 SHA512 547d1705c372a8b46169262d277c6d8129fdab8c00d3e6a62827b8ab5eb5948e8bc8c7643d0b2abfbed778ca97993f1fa47eabff1db76f315c64c02aa4b60617 WHIRLPOOL c5b786cd4636d71a215be117ea041fd5f5f80edda0d9c2afd9c90e4a9ba7509e158cffd8ba5a737bda3864603c06c41511c7657702fbdf95aac3b8298e3952bc
-DIST rustc-1.19.0-src.tar.gz 50108626 SHA256 15231f5053fb72ad82be91f5abfd6aa60cb7898c5089e4f1ac5910a731090c51 SHA512 080a8625fc15bc4fc17ab910bdcc0d9a88ce8922f1a3eb241d0f956b5799e4db6df45ebabb5497295c198be08686e5a94dff65569582fc6a5ecb9200cfee5c24 WHIRLPOOL 1dabcc0966a2e69f6c8105e39b82f31bc1c64803318c3a82f63f82afbc67e566d6969568678e86079e1fb515f73feb23d981920c232d836d297abf58010612fe
+DIST rustc-1.21.0-src.tar.gz 52555346 SHA256 1707c142244b5bd909993559c6116c81987c1de21d6207c05d3ecbe5bba548fa SHA512 47f29a5c9c926c1b209516a8546c67a24c1c6ee15c6302c8c6d340047b3e1f713cc6d09e568b67ae4b47b08cbb0befd95fc0d7a72f2ce21a5224d4e5da03b4f5 WHIRLPOOL 8bf9cee5481b3ff89297ba8c88cb4c92698ebc77211d6f1863cb0dcbb34d048f91ab992e7d87a54c624e29b1ef7936f0472a8ed511ae63f4dc95d1ea890bbb95
diff --git a/sdk_container/src/third_party/coreos-overlay/dev-libs/rustlib/rustlib-1.19.0-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-libs/rustlib/rustlib-1.21.0.ebuild
similarity index 93%
rename from sdk_container/src/third_party/coreos-overlay/dev-libs/rustlib/rustlib-1.19.0-r1.ebuild
rename to sdk_container/src/third_party/coreos-overlay/dev-libs/rustlib/rustlib-1.21.0.ebuild
index 224d783035..5e7f53ecf7 100644
--- a/sdk_container/src/third_party/coreos-overlay/dev-libs/rustlib/rustlib-1.19.0-r1.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/dev-libs/rustlib/rustlib-1.21.0.ebuild
@@ -9,16 +9,7 @@ DESCRIPTION="Standard libraries for Rust"
 HOMEPAGE="http://www.rust-lang.org/"
 LICENSE="|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA"
 
-CRATES="
-cmake-0.1.24
-filetime-0.1.10
-gcc-0.3.51
-libc-0.2.26
-"
-SRC_URI="
-https://static.rust-lang.org/dist/rustc-${PV}-src.tar.gz
-$(cargo_crate_uris ${CRATES})
-"
+SRC_URI="https://static.rust-lang.org/dist/rustc-${PV}-src.tar.gz"
 S="${WORKDIR}/rustc-${PV}-src"
 
 RDEPEND="!dev-lang/rust"
@@ -40,6 +31,8 @@ src_compile() {
 	local -x CARGO_TARGET_DIR="${T}/target"
 	# look up required crates in our fake registry
 	local -x CARGO_HOME="${ECARGO_HOME}"
+	# set this required bootstrapping variable
+	local -x CFG_COMPILER_HOST_TRIPLE="${RUST_TARGET}"
 	# fake out the compiler so that it lets us use #!feature attributes
 	# really building the std libs is bootstrapping anyway, so I don't feel bad
 	local -x RUSTC_BOOTSTRAP=1