standardize on the msft universal crt

opendlang · Sep 24, 2024 · 621c038 · 621c038
1 parent 00e1274
commit 621c038
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 10 deletions.
diff --git a/.github/actions/5-install/action.yml b/.github/actions/5-install/action.yml
@@ -54,7 +54,7 @@ runs:
         cp c:/program\ files/llvm/bin/lld-link.exe install/bin
         echo -e '[Environment64]\nDFLAGS=-I%@P%/../import -L-L%@P%/../lib -L--export-dynamic -fPIC' > install/bin/dmd.conf
         if [[ '${{ runner.os }}' == Windows ]]; then
-          echo -e '[Environment64]\nDFLAGS=-I%@P%/../import ucrtbase.lib\nLIB=%@P%/../lib;%@P%/../lib/mingw' > install/bin/dmd.conf
+          echo -e '[Environment64]\nDFLAGS=-I%@P%/../import\nLIB=%@P%/../lib;%@P%/../lib/mingw' > install/bin/dmd.conf
         fi
         if [[ '${{ runner.os }}' == macOS ]]; then
           echo -e '[Environment64]\nDFLAGS=-I%@P%/../import -L-L%@P%/../lib -fPIC' > install/bin/dmd.conf

diff --git a/compiler/src/dmd/vsoptions.d b/compiler/src/dmd/vsoptions.d
@@ -289,15 +289,7 @@ version (IN_LLVM) { /* not needed */ } else
      */
     const(char)* defaultRuntimeLibrary(bool x64)
     {
-        if (VCInstallDir is null)
-        {
-            detectVCInstallDir();
-            detectVCToolsInstallDir();
-        }
-        if (getVCLibDir(x64))
-            return "libcmt";
-        else
-            return "msvcrt120"; // mingw replacement
+        return "ucrtbase";
     }
 
     /**