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.

This commit is contained in:
Kelly Wilson
2010-03-10 20:21:05 -07:00
parent dd6a54d442
commit badb597962
3 changed files with 3 additions and 2 deletions

View File

@@ -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})

View File

@@ -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@",

View File

@@ -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)