From 4c22a76f07c4bf5b32bb6cdaba3a2e619b3fbeaa Mon Sep 17 00:00:00 2001
From: Alexey Prokhin <alexey.prokhin@yandex.ru>
Date: Sun, 31 Oct 2010 12:42:15 +0300
Subject: [PATCH] Fixed missing symbols in druntime library. Fixed a druntime
 crash in _d_invariant().

---
 runtime/CMakeLists.txt | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/runtime/CMakeLists.txt b/runtime/CMakeLists.txt
index 686448fc..10f2fa62 100644
--- a/runtime/CMakeLists.txt
+++ b/runtime/CMakeLists.txt
@@ -82,11 +82,11 @@ elseif(D_VERSION EQUAL 2)
 	file(GLOB DCRT_C ${RUNTIME_DC_DIR}/*.c)
 	list(REMOVE_ITEM DCRT_C ${RUNTIME_DC_DIR}/deh.c)
 	if(UNIX)
-		file(GLOB CORE_D_SYS ${RUNTIME_DIR}/src/core/sys/posix/*.d)
+		file(GLOB_RECURSE CORE_D_SYS ${RUNTIME_DIR}/src/core/sys/posix/*.d)
 	elseif(WIN32)
-		file(GLOB CORE_D_SYS ${RUNTIME_DIR}/src/core/sys/windows/*.d)
+		file(GLOB_RECURSE CORE_D_SYS ${RUNTIME_DIR}/src/core/sys/windows/*.d)
 	elseif(APPLE)
-		file(GLOB CORE_D_SYS ${RUNTIME_DIR}/src/core/sys/osx/*.d)
+		file(GLOB_RECURSE CORE_D_SYS ${RUNTIME_DIR}/src/core/sys/osx/*.d)
 	endif(UNIX)
 	list(APPEND CORE_D ${CORE_D_SYNC} ${CORE_D_SYS} ${RUNTIME_DIR}/src/object_.d
 		${RUNTIME_DIR}/src/std/intrinsic.d
@@ -173,8 +173,8 @@ macro(dc INPUT_D OUTLIST_O OUTLIST_BC INCDIR MOREFLAGS PATH)
 	add_custom_command(
 		OUTPUT
 			${OUTPUT_O}
-                        #${OUTPUT_BC}
-                COMMAND ${LDC_LOC} -c -I${INCDIR} -I${RUNTIME_GC_DIR} ${INPUT_D} -of${OUTPUT_O} ${D_FLAGS} ${MOREFLAGS}
+			#${OUTPUT_BC}
+				COMMAND ${LDC_LOC} -c -I${INCDIR} -I${RUNTIME_GC_DIR} ${INPUT_D} -of${OUTPUT_O} ${D_FLAGS} ${MOREFLAGS}
 		DEPENDS ${LDC_LOC}
 			${INPUT_D}
 			${LDC_IMPORTS}
@@ -183,7 +183,7 @@ macro(dc INPUT_D OUTLIST_O OUTLIST_BC INCDIR MOREFLAGS PATH)
 endmacro(dc)
 
 foreach(f ${CORE_D})
-	dc(${f} CORE_O CORE_BC ${RUNTIME_INCLUDE} "" "")
+	dc(${f} CORE_O CORE_BC ${RUNTIME_INCLUDE} "-disable-invariants" "")
 endforeach(f)
 
 foreach(f ${GC_D})