diff options
Diffstat (limited to 'projects')
| -rw-r--r-- | projects/CMakeLists.txt | 7 | ||||
| -rw-r--r-- | projects/sample/Makefile.llvm.rules | 4 | ||||
| -rw-r--r-- | projects/sample/autoconf/configure.ac | 4 | ||||
| -rwxr-xr-x | projects/sample/configure | 4 |
4 files changed, 13 insertions, 6 deletions
diff --git a/projects/CMakeLists.txt b/projects/CMakeLists.txt index dac637335bd1..36751cd31dac 100644 --- a/projects/CMakeLists.txt +++ b/projects/CMakeLists.txt @@ -10,3 +10,10 @@ foreach(entry ${entries}) endif() endif() endforeach(entry) + +# Also add in the compiler-rt tree if present and we have a sufficiently +# recent version of CMake. +if(${CMAKE_VERSION} VERSION_GREATER 2.8.7 AND + ${LLVM_BUILD_RUNTIME}) + add_llvm_external_project(compiler-rt) +endif() diff --git a/projects/sample/Makefile.llvm.rules b/projects/sample/Makefile.llvm.rules index a6553020f86f..7ed1c1b4ed6b 100644 --- a/projects/sample/Makefile.llvm.rules +++ b/projects/sample/Makefile.llvm.rules @@ -1437,7 +1437,7 @@ install-local:: uninstall-local:: $(Echo) Uninstall circumvented with NO_INSTALL else -DestTool = $(DESTDIR)$(PROJ_bindir)/$(TOOLEXENAME) +DestTool = $(DESTDIR)$(PROJ_bindir)/$(program_prefix)$(TOOLEXENAME) install-local:: $(DestTool) @@ -1451,7 +1451,7 @@ uninstall-local:: # TOOLALIAS install. ifdef TOOLALIAS -DestToolAlias = $(DESTDIR)$(PROJ_bindir)/$(TOOLALIAS)$(EXEEXT) +DestToolAlias = $(DESTDIR)$(PROJ_bindir)/$(program_prefix)$(TOOLALIAS)$(EXEEXT) install-local:: $(DestToolAlias) diff --git a/projects/sample/autoconf/configure.ac b/projects/sample/autoconf/configure.ac index bd0b16a4a698..8012c23412db 100644 --- a/projects/sample/autoconf/configure.ac +++ b/projects/sample/autoconf/configure.ac @@ -304,8 +304,8 @@ AC_CACHE_CHECK([target architecture],[llvm_cv_target_arch], sparc*-*) llvm_cv_target_arch="Sparc" ;; powerpc*-*) llvm_cv_target_arch="PowerPC" ;; arm*-*) llvm_cv_target_arch="ARM" ;; - mips-*) llvm_cv_target_arch="Mips" ;; - mipsel-*) llvm_cv_target_arch="Mips" ;; + mips-* | mips64-*) llvm_cv_target_arch="Mips" ;; + mipsel-* | mips64el-*) llvm_cv_target_arch="Mips" ;; xcore-*) llvm_cv_target_arch="XCore" ;; msp430-*) llvm_cv_target_arch="MSP430" ;; hexagon-*) llvm_cv_target_arch="Hexagon" ;; diff --git a/projects/sample/configure b/projects/sample/configure index df08c7c4e048..cfbb6c69224a 100755 --- a/projects/sample/configure +++ b/projects/sample/configure @@ -3840,8 +3840,8 @@ else sparc*-*) llvm_cv_target_arch="Sparc" ;; powerpc*-*) llvm_cv_target_arch="PowerPC" ;; arm*-*) llvm_cv_target_arch="ARM" ;; - mips-*) llvm_cv_target_arch="Mips" ;; - mipsel-*) llvm_cv_target_arch="Mips" ;; + mips-* | mips64-*) llvm_cv_target_arch="Mips" ;; + mipsel-* | mips64el-*) llvm_cv_target_arch="Mips" ;; xcore-*) llvm_cv_target_arch="XCore" ;; msp430-*) llvm_cv_target_arch="MSP430" ;; hexagon-*) llvm_cv_target_arch="Hexagon" ;; |