From 9259089c2bbf501477afc5791ba4b4d5978204b0 Mon Sep 17 00:00:00 2001 From: Frits van Bommel Date: Thu, 19 Feb 2009 13:50:05 +0100 Subject: [PATCH] Removing ldc.conf. (IMPORTANT: run 'cmake .' after pull) Added it to .hgignore. This gets rid of spurious differences caused by CMake regenerating it differently. Just run 'cmake .' to get it back in your local checkout. --- .hgignore | 1 + bin/ldc.conf | 4 ---- bin/ldc2.conf | 2 -- runtime/CMakeLists.txt | 5 ++++- 4 files changed, 5 insertions(+), 7 deletions(-) delete mode 100644 bin/ldc.conf delete mode 100644 bin/ldc2.conf diff --git a/.hgignore b/.hgignore index 06be4986..c5bdac16 100644 --- a/.hgignore +++ b/.hgignore @@ -23,6 +23,7 @@ syntax: regexp ^druntime ^import ^bin/ldc +^bin/ldc2?\.conf ^idgen.make ^impcnvgen.make ^ldc.make diff --git a/bin/ldc.conf b/bin/ldc.conf deleted file mode 100644 index f1c2354a..00000000 --- a/bin/ldc.conf +++ /dev/null @@ -1,4 +0,0 @@ - -[Environment] - -DFLAGS=-I%@P%/../tango -I%@P%/../tango/lib/common -L-L%@P%/../lib -version=Tango diff --git a/bin/ldc2.conf b/bin/ldc2.conf deleted file mode 100644 index 414f6711..00000000 --- a/bin/ldc2.conf +++ /dev/null @@ -1,2 +0,0 @@ -[Environment] -DFLAGS=-I%@P%/../druntime/import -L-L%@P%/../druntime/lib diff --git a/runtime/CMakeLists.txt b/runtime/CMakeLists.txt index bcad927a..9204b966 100644 --- a/runtime/CMakeLists.txt +++ b/runtime/CMakeLists.txt @@ -114,7 +114,9 @@ macro(dc INPUT_D OUTLIST_O OUTLIST_BC OUTDIR INCDIR MOREFLAGS) ${OUTPUT_O} ${OUTPUT_BC} COMMAND ${LDC_LOC} -c -I${INCDIR} -output-bc ${INPUT_D} -of${OUTPUT_O} ${D_FLAGS} ${MOREFLAGS} - DEPENDS ${LDC_LOC} ${LDC_IMPORTS} + DEPENDS ${LDC_LOC} + ${LDC_IMPORTS} + ${PROJECT_BINARY_DIR}/../bin/${LDC_EXE}.conf ) endmacro(dc) @@ -168,6 +170,7 @@ if(BUILD_BC_LIBS) ${CORE_BC} ${GC_BC} ${DCRT_BC} + ${LDC_IMPORTS} ) set(BCLIBS bclibs) endif(BUILD_BC_LIBS)