Merge pull request #3158 from kinke/stdcpp

druntime: Include core.stdcpp.* modules

Author: kinke

CMakeLists.txt

@@ -110,7 +110,7 @@ include(GetLinuxDistribution)
 #
 
 # Version information
-set(LDC_VERSION "1.21.0") # May be overridden by git hash tag
+set(LDC_VERSION "1.22.0") # May be overridden by git hash tag
 set(DMDFE_MAJOR_VERSION   2)
 set(DMDFE_MINOR_VERSION   0)
 set(DMDFE_PATCH_VERSION   92)

runtime/CMakeLists.txt

@@ -153,10 +153,6 @@ file(GLOB_RECURSE DRUNTIME_D ${RUNTIME_DIR}/src/*.d)
 list(REMOVE_ITEM DRUNTIME_D ${RUNTIME_DIR}/src/test_runner.d)
 # remove unsupported etc/linux/memoryerror.d (see issue #1915)
 list(REMOVE_ITEM DRUNTIME_D ${RUNTIME_DIR}/src/etc/linux/memoryerror.d)
-# FIXME: Remove all modules in core/stdcpp/ due to alpha quality.
-#        See PR #1917; partly fixed upstream.
-file(GLOB_RECURSE DRUNTIME_D_STDCPP ${RUNTIME_DIR}/src/core/stdcpp/*.d)
-list(REMOVE_ITEM DRUNTIME_D ${DRUNTIME_D_STDCPP})
 # remove some modules in rt/
 list(REMOVE_ITEM DRUNTIME_D
     ${RUNTIME_DIR}/src/rt/alloca.d

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}