# HG changeset patch # User Kelly Wilson # Date 1268277665 25200 # Node ID 18bbb143615372537f255b579d700e3860bbbeba # Parent 638a823ace4501959f42fe04244a7ad1246aa5a9 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. diff -r 638a823ace45 -r 18bbb1436153 CMakeLists.txt --- a/CMakeLists.txt Wed Mar 10 19:35:14 2010 -0700 +++ b/CMakeLists.txt Wed Mar 10 20:21:05 2010 -0700 @@ -23,7 +23,6 @@ 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 -r 638a823ace45 -r 18bbb1436153 ldc.conf.in --- a/ldc.conf.in Wed Mar 10 19:35:14 2010 -0700 +++ b/ldc.conf.in Wed Mar 10 20:21:05 2010 -0700 @@ -12,7 +12,9 @@ // 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 -r 638a823ace45 -r 18bbb1436153 runtime/CMakeLists.txt --- a/runtime/CMakeLists.txt Wed Mar 10 19:35:14 2010 -0700 +++ b/runtime/CMakeLists.txt Wed Mar 10 20:21:05 2010 -0700 @@ -46,7 +46,7 @@ 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)