druntime: Enable stdcpp integration tests on Windows

ldc-developers · May 24, 2020 · b8512eb · b8512eb
1 parent d651f88
commit b8512eb
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/runtime/StandaloneDRuntimeTests.cmake b/runtime/StandaloneDRuntimeTests.cmake
@@ -27,6 +27,12 @@ else()
     endif()
 endif()
 
+if("${TARGET_SYSTEM}" MATCHES "MSVC")
+    set(cflags_base "CFLAGS_BASE=")
+else()
+    set(cflags_base "CFLAGS_BASE=-Wall -Wl,-rpath,${CMAKE_BINARY_DIR}/lib${LIB_SUFFIX}")
+endif()
+
 if("${TARGET_SYSTEM}" MATCHES "FreeBSD|DragonFly")
     set(linkdl "")
 else()
@@ -51,8 +57,7 @@ foreach(name ${testnames})
         COMMAND ${GNU_MAKE_BIN} -C ${PROJECT_SOURCE_DIR}/druntime/test/${name}
             ROOT=${outdir} DMD=${LDMD_EXE_FULL} MODEL=default
             DRUNTIME=${druntime_path} DRUNTIMESO=${shared_druntime_path}
-            CFLAGS_BASE=-Wall\ -Wl,-rpath,${CMAKE_BINARY_DIR}/lib${LIB_SUFFIX}
-            ${linkdl}
+            ${cflags_base} ${linkdl}
     )
     set_tests_properties(druntime-test-${name}
         PROPERTIES DEPENDS clean-druntime-test-${name}

diff --git a/runtime/druntime b/runtime/druntime