From 3b698fa2a1ee06e97c32dc6e125fd5f4e6487838 Mon Sep 17 00:00:00 2001 From: kai Date: Sat, 24 Aug 2013 16:17:55 +0200 Subject: [PATCH] Add FreeBSD files to druntime build --- runtime/CMakeLists.txt | 8 ++++++++ runtime/druntime | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/runtime/CMakeLists.txt b/runtime/CMakeLists.txt index 94a527d3..d6f8fff8 100644 --- a/runtime/CMakeLists.txt +++ b/runtime/CMakeLists.txt @@ -88,12 +88,20 @@ if(APPLE) list(APPEND DCRT_C ${RUNTIME_DIR}/src/ldc/osx_tls.c) endif() file(GLOB_RECURSE CORE_D_UNIX ${RUNTIME_DIR}/src/core/sys/posix/*.d) +file(GLOB_RECURSE CORE_D_FREEBSD ${RUNTIME_DIR}/src/core/sys/freebsd/*.d) +file(GLOB_RECURSE CORE_D_LINUX ${RUNTIME_DIR}/src/core/sys/linux/*.d) file(GLOB_RECURSE CORE_D_OSX ${RUNTIME_DIR}/src/core/sys/osx/*.d) file(GLOB_RECURSE CORE_D_WIN ${RUNTIME_DIR}/src/core/sys/windows/*.d) set(CORE_D_SYS) set(DCRT_ASM) if(UNIX) list(APPEND CORE_D_SYS ${CORE_D_UNIX}) + if(${CMAKE_SYSTEM} MATCHES "FreeBSD") + list(APPEND CORE_D_SYS ${CORE_D_FREEBSD}) + endif() + if(${CMAKE_SYSTEM} MATCHES "Linux") + list(APPEND CORE_D_SYS ${CORE_D_LINUX}) + endif() list(APPEND DCRT_ASM ${RUNTIME_DIR}/src/core/threadasm.S) if(APPLE) list(APPEND CORE_D_SYS ${CORE_D_OSX}) diff --git a/runtime/druntime b/runtime/druntime index 6c6a4a11..9464c8f9 160000 --- a/runtime/druntime +++ b/runtime/druntime @@ -1 +1 @@ -Subproject commit 6c6a4a116c92268356e03e096e1900f32ce72aaf +Subproject commit 9464c8f95dae06fbf8b09c4697df7e99fb0bc80a