diff --git a/src/bootstrap/native.rs b/src/bootstrap/native.rs
index 27c9bb2504f6d..603881b6a5850 100644
--- a/src/bootstrap/native.rs
+++ b/src/bootstrap/native.rs
@@ -515,7 +515,8 @@ fn configure_cmake(
     cfg.define("CMAKE_C_FLAGS", cflags);
     let mut cxxflags = builder.cflags(target, GitRepo::Llvm).join(" ");
     if builder.config.llvm_static_stdcpp && !target.contains("msvc") && !target.contains("netbsd") {
-        cxxflags.push_str(" -static-libstdc++");
+        cfg.define("CMAKE_SHARED_LINKER_FLAGS", "-static-libstdc++");
+        cfg.define("CMAKE_EXE_LINKER_FLAGS", "-static-libstdc++");
     }
     if let Some(ref s) = builder.config.llvm_cxxflags {
         cxxflags.push_str(&format!(" {}", s));