Merge pull request #3704 from kinke/dll2

CMake: Support BUILD_SHARED_LIBS for Windows too

Author: kinke

.azure-pipelines/5-integration_test.yml

@@ -14,14 +14,17 @@ steps:
 - bash: |
     set -ex
     cd ..
-    installed/bin/ldc2 hello.d -m64 -of=hello64 -link-defaultlib-shared
-    ./hello64
+    if [ "$CI_OS" = "windows" ]; then
+      # Add druntime/Phobos DLL dir to PATH
+      export PATH="$PWD/installed/bin:$PATH"
+    fi
+    installed/bin/ldc2 hello.d -link-defaultlib-shared
+    ./hello
     if [ "$CI_OS" = "linux" ]; then
-      installed/bin/ldc2 hello.d -m32 -of=hello32 -link-defaultlib-shared
-      ./hello32
+      installed/bin/ldc2 hello.d -m32 -link-defaultlib-shared
+      ./hello
     fi
   displayName: Run hello-world integration test with shared libs
-  condition: and(succeeded(), ne(variables['CI_OS'], 'windows'))
 
 - bash: |
     set -ex
@@ -40,7 +43,7 @@ steps:
     cd ..
     if [ "$CI_OS" = "windows" ]; then
       # Add ldc-jit.dll dir to PATH
-      export PATH="$PWD/installed/lib:$PATH"
+      export PATH="$PWD/installed/bin:$PATH"
     fi
     installed/bin/ldc2 -enable-dynamic-compile -run $BUILD_SOURCESDIRECTORY/tests/dynamiccompile/array.d
   displayName: Run dynamic-compile integration test

.azure-pipelines/windows-merge.yml

@@ -37,6 +37,7 @@ steps:
     mv lib lib64
     cp -r ../ldc2-*-x86/lib .
     mv lib lib32
+    cp ../ldc2-*-x86/bin/*.dll ../ldc2-*-x86/bin/*.pdb lib32/
   displayName: Extract & merge artifacts
 - powershell: |
     cd ldc2-*-multilib
@@ -68,6 +69,13 @@ steps:
     %ARTIFACT_NAME%\bin\ldc2 -v -run hello.d || exit /b
     %ARTIFACT_NAME%\bin\ldc2 -v -m32 -run hello.d
   displayName: Run 32/64-bit hello-world smoke test with MSVC auto-detection
+- script: |
+    echo on
+    set PATH=%ARTIFACT_NAME%\bin;%PATH%
+    %ARTIFACT_NAME%\bin\ldc2 -link-defaultlib-shared -run hello.d || exit /b
+    set PATH=%ARTIFACT_NAME%\lib32;%PATH%
+    %ARTIFACT_NAME%\bin\ldc2 -link-defaultlib-shared -m32 -run hello.d
+  displayName: Run 32/64-bit hello-world smoke test with shared libs
 
 # Pack, build installer & publish artifacts
 - script: |

.azure-pipelines/windows.yml

@@ -76,7 +76,7 @@ steps:
     clang-cl --version
     mkdir bootstrap-ldc
     cd bootstrap-ldc
-    cmake -G Ninja %BUILD_SOURCESDIRECTORY% -DCMAKE_C_COMPILER:PATH=clang-cl.exe -DCMAKE_CXX_COMPILER:PATH=clang-cl.exe -DCMAKE_BUILD_TYPE=Release -DLLVM_ROOT_DIR=%CD%/../llvm -DD_COMPILER=%CD%/../host-ldc/bin/ldmd2 -DBUILD_LTO_LIBS=ON
+    cmake -G Ninja %BUILD_SOURCESDIRECTORY% -DCMAKE_C_COMPILER:PATH=clang-cl.exe -DCMAKE_CXX_COMPILER:PATH=clang-cl.exe -DCMAKE_BUILD_TYPE=Release -DLLVM_ROOT_DIR=%CD%/../llvm -DD_COMPILER=%CD%/../host-ldc/bin/ldmd2 -DBUILD_SHARED_LIBS=OFF -DBUILD_LTO_LIBS=ON
     ninja -j4 || exit /b
     bin\ldc2 --version
   displayName: Build bootstrap LDC
@@ -116,7 +116,8 @@ steps:
 - script: |
     cd ..
     :: git's usr/bin/bash, unlike its bin/bash, leaves PATH as-is
-    set PATH=C:\Program Files\Git\usr\bin;%PATH%
+    :: also add druntime/Phobos DLL dir to PATH
+    set PATH=%CD%\build\lib;C:\Program Files\Git\usr\bin;%PATH%
     call "%LDC_VSDIR%\Common7\Tools\VsDevCmd.bat" -arch=%ARCH%
     set DMD_TESTSUITE_MAKE_ARGS=-j4
     cd build
@@ -125,8 +126,8 @@ steps:
   condition: succeededOrFailed()
 - script: |
     cd ..
-    :: Add libcurl.dll dir to PATH
-    set PATH=%CD%\libcurl\ldc2;C:\Program Files\Git\usr\bin;%PATH%
+    :: Add druntime/Phobos/libcurl.dll dir to PATH
+    set PATH=%CD%\build\lib;%CD%\libcurl\ldc2;C:\Program Files\Git\usr\bin;%PATH%
     call "%LDC_VSDIR%\Common7\Tools\VsDevCmd.bat" -arch=%ARCH%
     cd build
     ctest -j4 --output-on-failure -E "dmd-testsuite|lit-tests|ldc2-unittest"

driver/linker-msvc.cpp

@@ -144,6 +144,12 @@ int linkObjToBinaryMSVC(llvm::StringRef outputPath,
     args.push_back(objfile);
   }
 
+  // add precompiled rt.dso_windows object file (in lib directory) when linking
+  // against shared druntime
+  if (!defaultLibNames.empty() && linkAgainstSharedDefaultLibs()) {
+    args.push_back("dso_windows.obj");
+  }
+
   // .res/.def files
   if (global.params.resfile.length)
     args.push_back(global.params.resfile.ptr);

driver/linker.cpp

@@ -246,8 +246,7 @@ llvm::StringRef getMscrtLibName(const bool *useInternalToolchain) {
   if (useInternal) {
     return "vcruntime140";
   } else {
-    // default to static release variant
-    return linkFullyStatic() != llvm::cl::BOU_FALSE ? "libcmt" : "msvcrt";
+    return linkAgainstSharedDefaultLibs() ? "msvcrt" : "libcmt";
   }
 }