Skip to content

Commit 2e19062

Browse files
committed
druntime: Enable stdcpp integration tests on Windows
1 parent d651f88 commit 2e19062

File tree

2 files changed

+8
-3
lines changed

2 files changed

+8
-3
lines changed

runtime/StandaloneDRuntimeTests.cmake

+7-2
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,12 @@ else()
2727
endif()
2828
endif()
2929

30+
if(MSVC)
31+
set(cflags_base "CFLAGS_BASE=")
32+
else()
33+
set(cflags_base "CFLAGS_BASE=-Wall -Wl,-rpath,${CMAKE_BINARY_DIR}/lib${LIB_SUFFIX}")
34+
endif()
35+
3036
if("${TARGET_SYSTEM}" MATCHES "FreeBSD|DragonFly")
3137
set(linkdl "")
3238
else()
@@ -51,8 +57,7 @@ foreach(name ${testnames})
5157
COMMAND ${GNU_MAKE_BIN} -C ${PROJECT_SOURCE_DIR}/druntime/test/${name}
5258
ROOT=${outdir} DMD=${LDMD_EXE_FULL} MODEL=default
5359
DRUNTIME=${druntime_path} DRUNTIMESO=${shared_druntime_path}
54-
CFLAGS_BASE=-Wall\ -Wl,-rpath,${CMAKE_BINARY_DIR}/lib${LIB_SUFFIX}
55-
${linkdl}
60+
${cflags_base} ${linkdl}
5661
)
5762
set_tests_properties(druntime-test-${name}
5863
PROPERTIES DEPENDS clean-druntime-test-${name}

runtime/druntime

0 commit comments

Comments
 (0)