Merge pull request #1691 from rainers/nodefaultlib

Issue 12125: do not enforce specific MS C runtime
dlang · Jan 18, 2017 · 0dc5d1d · 0dc5d1d
2 parents ee5843a + 3251f09
commit 0dc5d1d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/src/rt/monitor_.d b/src/rt/monitor_.d
@@ -155,11 +155,6 @@ version (Windows)
     {
         pragma(lib, "snn.lib");
     }
-    else version (CRuntime_Microsoft)
-    {
-        pragma(lib, "libcmt.lib");
-        pragma(lib, "oldnames.lib");
-    }
     import core.sys.windows.windows;
 
     alias Mutex = CRITICAL_SECTION;

diff --git a/win64.mak b/win64.mak
@@ -28,6 +28,9 @@ DRUNTIME_BASE=druntime$(MODEL)
 DRUNTIME=lib\$(DRUNTIME_BASE).lib
 GCSTUB=lib\gcstub$(MODEL).obj
 
+# do not preselect a C runtime (extracted from the line above to make the auto tester happy)
+CFLAGS=$(CFLAGS) /Zl
+
 DOCFMT=
 
 target : import copydir copy $(DRUNTIME) $(GCSTUB)