Changeset 808:4ad1e7b10378

Timestamp:

11/30/08 13:19:39 (1 month ago)

Author:

elrood

branch:

default

Message:

when building the runtime pass -fPIC for shared libs and -disable-invariants for gc

Files:

• bin/ldc2.conf (modified) (1 diff)
• ldc2.conf.in (modified) (1 diff)
• runtime/CMakeLists.txt (modified) (7 diffs)

bin/ldc2.conf

@@ -1 @@
-
-[Environment]
-
-DFLAGS=-I%@P%/../druntime/import -L-L%@P%/../druntime/lib

ldc2.conf.in

@@ -1 @@
-
-[Environment]
-
-DFLAGS=-I@RUNTIME_DIR@/import -L-L@RUNTIME_DIR@/lib

runtime/CMakeLists.txt

@@ -13 +13 @@
-set(D_FLAGS -g -w -d CACHE STRING "runtime build flags, separated by ;")
-
+if(BUILD_SHARED_LIBS)
+    list(APPEND D_FLAGS -fPIC)
+endif(BUILD_SHARED_LIBS)
+
+# build tango for D1, druntime for D2
-if(D_VERSION EQUAL 1)
-    set(RUNTIME tango)
@@ -24 +29 @@
-
-if(D_VERSION EQUAL 1)
-    # build tango for D1, druntime for D2
-    set(LDC_EXE ldc)
-    # copy imports to runtime dir
@@ -54 +58 @@
-    file(GLOB CORE_D ${RUNTIME_DIR}/src/common/core/*.d)
-    file(GLOB CORE_C ${RUNTIME_DIR}/src/common/core/stdc/*.c)
-else(D_VERSION EQUAL 1)
-    message(FATAL_ERROR "set d version to 1 or 2")
-endif(D_VERSION EQUAL 1)
-
@@ -86 +88 @@
-        WORKING_DIRECTORY ${RUNTIME_DIR}
-    )
+    # rebuild cache to include sources added by patch
-    add_custom_command(
-        OUTPUT recache
@@ -98 +101 @@
-
-# compile d file into outdir, include incdir, and append names of generated .o and .bc to outlist_o and _bc
-
+ MOREFLAGS
-    get_filename_component(BASENAME ${INPUT_D} NAME_WE)
-    set(OUTPUT_O ${PROJECT_BINARY_DIR}/${OUTDIR}/${BASENAME}.o)
@@ -108 +111 @@
-            ${OUTPUT_O}
-            ${OUTPUT_BC}
-
+ ${MOREFLAGS}
-        DEPENDS ${LDC_LOC}
-    )
@@ -115 +118 @@
-# dc_dir include for core and gc only necessary with druntime
-foreach(f ${CORE_D})
-
+ ""
-endforeach(f)
-
-foreach(f ${GC_D})
-
+ "-disable-invariants"
-endforeach(f)
-
-foreach(f ${DCRT_D})
-
+ ""
-endforeach(f)
-