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 | e9bbafe1ebcdcfab3a4e027b3ac76b72a0dbedba (patch) | |
| tree | 08d5ae413cec75b562eb67c2d3fbe8715b1943c0 | |
| parent | 84bc8c3058ce23c6362959f7038e8edbb6039afe (diff) | |
| download | bcm5719-llvm-e9bbafe1ebcdcfab3a4e027b3ac76b72a0dbedba.tar.gz bcm5719-llvm-e9bbafe1ebcdcfab3a4e027b3ac76b72a0dbedba.zip | |
Two small fixes for site.exp for cmake.
llvm-svn: 86453
| -rw-r--r-- | llvm/test/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | llvm/test/Makefile | 5 | ||||
| -rw-r--r-- | llvm/test/site.exp.in | 3 |
3 files changed, 8 insertions, 4 deletions
diff --git a/llvm/test/CMakeLists.txt b/llvm/test/CMakeLists.txt index 36572852dc3..d7037ab44c3 100644 --- a/llvm/test/CMakeLists.txt +++ b/llvm/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/llvm/test/Makefile b/llvm/test/Makefile index 2eba9159049..1387d56cb19 100644 --- a/llvm/test/Makefile +++ b/llvm/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/llvm/test/site.exp.in b/llvm/test/site.exp.in index bbb9638fe00..f88d36198be 100644 --- a/llvm/test/site.exp.in +++ b/llvm/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@" |
