diff options
| author | Daniel Dunbar <daniel@zuster.org> | 2009-11-08 09:29:52 +0000 |
|---|---|---|
| committer | Daniel Dunbar <daniel@zuster.org> | 2009-11-08 09:29:52 +0000 |
| commit | 4080d10b4ba943830865945546028d6a975ad964 (patch) | |
| tree | 551be0f8e06834214911080c9aad4479b4d4ed7b /test | |
| parent | 5ed7be1a401d7f75e08623b0172f0318f2977e31 (diff) | |
| download | external_llvm-4080d10b4ba943830865945546028d6a975ad964.zip external_llvm-4080d10b4ba943830865945546028d6a975ad964.tar.gz external_llvm-4080d10b4ba943830865945546028d6a975ad964.tar.bz2 | |
Two small fixes for site.exp for cmake.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@86453 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'test')
| -rw-r--r-- | test/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | test/Makefile | 5 | ||||
| -rw-r--r-- | test/site.exp.in | 3 |
3 files changed, 8 insertions, 4 deletions
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 3657285..d7037ab 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -3,6 +3,10 @@ foreach(c ${LLVM_TARGETS_TO_BUILD}) endforeach(c) set(TARGETS_TO_BUILD ${TARGETS_BUILT}) +# FIXME: This won't work for project files, we need to use a --param. +set(LLVM_LIBS_DIR "${LLVM_BINARY_DIR}/lib/${CMAKE_CFG_INTDIR}") +set(SHLIBEXT "${LTDL_SHLIB_EXT}") + include(FindPythonInterp) if(PYTHONINTERP_FOUND) configure_file( diff --git a/test/Makefile b/test/Makefile index 2eba915..1387d56 100644 --- a/test/Makefile +++ b/test/Makefile @@ -148,9 +148,8 @@ FORCE: site.exp: FORCE @echo 'Making a new site.exp file...' - @echo '## these variables are automatically generated by make ##' >site.tmp - @echo '# Do not edit here. If you wish to override these values' >>site.tmp - @echo '# edit the last section' >>site.tmp + @echo '## Autogenerated by LLVM configuration.' > site.tmp + @echo '# Do not edit!' >> site.tmp @echo 'set target_triplet "$(TARGET_TRIPLE)"' >> site.tmp @echo 'set TARGETS_TO_BUILD "$(TARGETS_TO_BUILD)"' >> site.tmp @echo 'set llvmgcc_langs "$(LLVMGCC_LANGS)"' >> site.tmp diff --git a/test/site.exp.in b/test/site.exp.in index bbb9638..f88d361 100644 --- a/test/site.exp.in +++ b/test/site.exp.in @@ -1,9 +1,10 @@ -## Autogenerated by LLVM/Clang configuration. +## Autogenerated by LLVM configuration. # Do not edit! set target_triplet "@TARGET_TRIPLE@" set TARGETS_TO_BUILD "@TARGETS_TO_BUILD@" set llvmgcc_langs "@LLVMGCC_LANGS@" set llvmgcc_version "@LLVMGCC_VERSION@" +set llvmtoolsdir "@LLVM_TOOLS_DIR@" set llvmlibsdir "@LLVM_LIBS_DIR@" set llvm_bindings "@LLVM_BINDINGS@" set srcroot "@LLVM_SOURCE_DIR@" |