link vcruntime statically

vadimcn · Jul 28, 2016 · 32a8269 · 32a8269
1 parent f2e59cc
commit 32a8269
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/configure b/configure
@@ -1730,6 +1730,7 @@ do
         fi
         # FIXME: What about LDFLAGS?
     fi
+    CMAKE_ARGS="$CMAKE_ARGS '-DCMAKE_C_FLAGS=-D_VCRTIMP=' '-DCMAKE_CXX_FLAGS=-D_VCRTIMP='"
 
     if [ -n "$CFG_DISABLE_OPTIMIZE_LLVM" ]; then
         CMAKE_ARGS="$CMAKE_ARGS -DCMAKE_BUILD_TYPE=Debug"

diff --git a/src/librustc_trans/back/linker.rs b/src/librustc_trans/back/linker.rs
@@ -45,6 +45,8 @@ impl<'a, 'tcx> LinkerInfo {
                      cmd: &'a mut Command,
                      sess: &'a Session) -> Box<Linker+'a> {
         if sess.target.target.options.is_like_msvc {
+            cmd.arg("/NODEFAULTLIB:vcruntime.lib");
+            cmd.arg("libvcruntime.lib");
             Box::new(MsvcLinker {
                 cmd: cmd,
                 sess: sess,