diff --git a/sdk_container/src/third_party/coreos-overlay/sys-libs/nss-usrfiles/nss-usrfiles-2.18.1.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-libs/nss-usrfiles/nss-usrfiles-2.18.1-r1.ebuild
similarity index 100%
rename from sdk_container/src/third_party/coreos-overlay/sys-libs/nss-usrfiles/nss-usrfiles-2.18.1.ebuild
rename to sdk_container/src/third_party/coreos-overlay/sys-libs/nss-usrfiles/nss-usrfiles-2.18.1-r1.ebuild
diff --git a/sdk_container/src/third_party/coreos-overlay/sys-libs/nss-usrfiles/nss-usrfiles-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-libs/nss-usrfiles/nss-usrfiles-9999.ebuild
index 2404643d6c..073762d4d9 100644
--- a/sdk_container/src/third_party/coreos-overlay/sys-libs/nss-usrfiles/nss-usrfiles-9999.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/sys-libs/nss-usrfiles/nss-usrfiles-9999.ebuild
@@ -27,7 +27,7 @@ DEPEND=""
 RDEPEND=""
 
 src_configure() {
-	: # Don't bother with the custom configure script.
+	tc-export CC
 }
 
 src_compile() {