From badb59796224a012f9d21650d4c838ee98697cc0 Mon Sep 17 00:00:00 2001 From: Kelly Wilson Date: Wed, 10 Mar 2010 20:21:05 -0700 Subject: [PATCH] Change the ldc.conf file output to match the newer Tango directory structure and only use libtango-user-ldc for the libs to match the 0.99.9 build instructions. --- CMakeLists.txt | 1 - ldc.conf.in | 2 ++ runtime/CMakeLists.txt | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c770561a..b263d70f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -23,7 +23,6 @@ else(NOT PKG_CONFIG_FOUND) endif(NOT LIBCONFIGPP_FOUND) endif(NOT PKG_CONFIG_FOUND) - find_program(LLVM_CONFIG llvm-config ${LLVM_INSTDIR}/bin DOC "path to llvm-config tool") # get llvm's install dir. a little hackish, we could do something like llvm-config --prefix, but this does as well string(REPLACE "/bin/llvm-config" "" LLVM_DIR ${LLVM_CONFIG}) diff --git a/ldc.conf.in b/ldc.conf.in index 119bea67..6837267c 100644 --- a/ldc.conf.in +++ b/ldc.conf.in @@ -12,7 +12,9 @@ default: // arguments before they are parsed. switches = [ "-I@RUNTIME_DIR@", + "-I@RUNTIME_DIR@/user", "-I@RUNTIME_DIR@/lib/common", + "-I@RUNTIME_DIR@/tango/core/vendor", "-L-L%%ldcbinarypath%%/../lib", "-d-version=Tango", "-defaultlib=@RUNTIME_AIO@", diff --git a/runtime/CMakeLists.txt b/runtime/CMakeLists.txt index 1df5b752..656fa670 100644 --- a/runtime/CMakeLists.txt +++ b/runtime/CMakeLists.txt @@ -46,7 +46,7 @@ if(D_VERSION EQUAL 1) set(RUNTIME_CC tango-cc-tango) set(RUNTIME_GC tango-gc-basic) set(RUNTIME_DC ldc-runtime) - set(RUNTIME_AIO tango-base-ldc) + set(RUNTIME_AIO tango-user-ldc) # set paths to source files, or fill lists directly set(RUNTIME_DC_DIR ${PROJECT_SOURCE_DIR}/internal) set(RUNTIME_GC_DIR ${RUNTIME_DIR}/lib/gc/basic)