[llvm-branch-commits] [cfe-branch] r102775 - /cfe/branches/Apple/cremebrulee-IB/Makefile

[Daniel Dunbar]

Author: ddunbar
Date: Fri Apr 30 16:34:55 2010
New Revision: 102775

URL: http://llvm.org/viewvc/llvm-project?rev=102775&view=rev
Log:
Add Install_Path_Suffix make variable, for setting the installed path suffix (i.e., .../usr).

Also, move Clang_Enable_Bootstrap to per-project section.

Modified:
    cfe/branches/Apple/cremebrulee-IB/Makefile

Modified: cfe/branches/Apple/cremebrulee-IB/Makefile
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/Apple/cremebrulee-IB/Makefile?rev=102775&r1=102774&r2=102775&view=diff
==============================================================================
--- cfe/branches/Apple/cremebrulee-IB/Makefile (original)
+++ cfe/branches/Apple/cremebrulee-IB/Makefile Fri Apr 30 16:34:55 2010
@@ -14,8 +14,6 @@
 Clang_Extra_Options    := -g -DDISABLE_SMART_POINTERS
 # Enable use of clang++?
 Clang_Enable_CXX       := 1
-# Enable bootstrap build.
-Clang_Enable_Bootstrap := 1
 # Build all LLVM tools; not just clang?
 Clang_Build_All        := 0
 
@@ -27,12 +25,16 @@
 # Don't install root links or license.
 Post_Install_RootLinks := 0
 Post_Install_OpenSourceLicense := 0
+# Install to .../usr
+Install_Path_Suffix := usr
 # Include x86 and ARM backends.
 LLVM_Backends := x86,arm
 # Don't use extra make variables.
 Extra_Make_Variables :=
 # LLVM level install target is 'install-clang.
 LLVM_Install_Target := install-clang
+# Don't bootstrap by default.
+Clang_Enable_Bootstrap := 0
 
 ##
 # Per Project/Target Configuration
@@ -51,6 +53,8 @@
 # Install root links and license.
 Post_Install_RootLinks := 1
 Post_Install_OpenSourceLicense := 1
+# Enable bootstrap build.
+Clang_Enable_Bootstrap := 1
 
 endif
 
@@ -110,6 +114,12 @@
   $(error "invalid install prefix: '$(Install_Prefix)'")
 endif
 
+ifneq ($(Install_Path_Suffix),)
+Install_Prefix := $(Install_Prefix)/$(Install_Path_Suffix)
+else
+$(error "invalid setting for install path suffix: '$(Install_Path_Suffix)'")
+endif
+
 # Set configure flags.
 Configure_Flags = --enable-targets=$(LLVM_Backends) \
 		  --enable-optimized \