diff options
| author | Roman Divacky <rdivacky@FreeBSD.org> | 2010-02-16 09:30:23 +0000 |
|---|---|---|
| committer | Roman Divacky <rdivacky@FreeBSD.org> | 2010-02-16 09:30:23 +0000 |
| commit | 6fe5c7aa327e188b7176daa5595bbf075a6b94df (patch) | |
| tree | 4cfca640904d1896e25032757a61f8959c066919 /projects | |
| parent | 989df958a10f0beb90b89ccadd8351cbe51d90b1 (diff) | |
| download | src-6fe5c7aa327e188b7176daa5595bbf075a6b94df.tar.gz src-6fe5c7aa327e188b7176daa5595bbf075a6b94df.zip | |
Update LLVM to r96341.
Notes
Notes:
svn path=/vendor/llvm/dist/; revision=203954
Diffstat (limited to 'projects')
| -rw-r--r-- | projects/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | projects/sample/autoconf/configure.ac | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/projects/CMakeLists.txt b/projects/CMakeLists.txt index 1a286db9ec66..415530e33236 100644 --- a/projects/CMakeLists.txt +++ b/projects/CMakeLists.txt @@ -4,7 +4,7 @@ file(GLOB entries *) foreach(entry ${entries}) if(IS_DIRECTORY ${entry} AND EXISTS ${entry}/CMakeLists.txt) - if(NOT (${entry} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR}/compiler-rt)) + if(NOT ${entry} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR}/compiler-rt) add_subdirectory(${entry}) endif() endif() diff --git a/projects/sample/autoconf/configure.ac b/projects/sample/autoconf/configure.ac index 37c93a8f5152..221dcc45edc0 100644 --- a/projects/sample/autoconf/configure.ac +++ b/projects/sample/autoconf/configure.ac @@ -6,14 +6,15 @@ AC_INIT([[[SAMPLE]]],[[[x.xx]]],[bugs@yourdomain]) dnl Identify where LLVM source tree is LLVM_SRC_ROOT="../../" LLVM_OBJ_ROOT="../../" -dnl Tell autoconf that the auxilliary files are actually located in -dnl the LLVM autoconf directory, not here. -AC_CONFIG_AUX_DIR($LLVM_SRC_ROOT/autoconf) dnl Tell autoconf that this is an LLVM project being configured dnl This provides the --with-llvmsrc and --with-llvmobj options LLVM_CONFIG_PROJECT($LLVM_SRC_ROOT,$LLVM_OBJ_ROOT) +dnl Tell autoconf that the auxilliary files are actually located in +dnl the LLVM autoconf directory, not here. +AC_CONFIG_AUX_DIR($LLVM_SRC/autoconf) + dnl Verify that the source directory is valid AC_CONFIG_SRCDIR(["Makefile.common.in"]) |