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

[Daniel Dunbar]

Author: ddunbar
Date: Fri Apr 30 16:30:16 2010
New Revision: 102773

URL: http://llvm.org/viewvc/llvm-project?rev=102773&view=rev
Log:
Add Extra_Make_Variables per-project variable, and use to simplify.

Also, add LLVM_Install_Target per-project variable.

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=102773&r1=102772&r2=102773&view=diff
==============================================================================
--- cfe/branches/Apple/cremebrulee-IB/Makefile (original)
+++ cfe/branches/Apple/cremebrulee-IB/Makefile Fri Apr 30 16:30:16 2010
@@ -29,6 +29,10 @@
 Post_Install_OpenSourceLicense := 0
 # 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
 
 ##
 # Per Project/Target Configuration
@@ -37,6 +41,8 @@
 
 # Install to / by default.
 Default_Install_Root := /
+# Don't build compiler-rt.
+Extra_Make_Variables += CLANG_NO_RUNTIME=1
 
 else
 
@@ -71,7 +77,7 @@
 endif
 
 # Set makefile variables to pass during build and install.
-Clang_Make_Variables := KEEP_SYMBOLS=1 CLANG_VENDOR=Apple
+Clang_Make_Variables := $(Extra_Make_Variables) KEEP_SYMBOLS=1 CLANG_VENDOR=Apple
 ifeq ($(Clang_Driver_Mode), Production)
 Clang_Make_Variables += CLANG_IS_PRODUCTION=1
 
@@ -139,7 +145,7 @@
 endif
 
 # Set install and build targets.
-Install_Target = $(Clang_Make_Variables) install-clang
+Install_Target = $(Clang_Make_Variables) $(LLVM_Install_Target)
 Build_Target = $(Clang_Make_Variables) $(Clang_Build_Target)
 
 # Set default target.
@@ -339,7 +345,7 @@
 		$(MKDIR) $(OBJROOT)/install-$$arch && \
 		umask 0022 && \
 		$(MAKE) -C $(OBJROOT)/$$arch \
-		  $(Install_Flags) $(Install_Target) CLANG_NO_RUNTIME=1 || exit 1 ; \
+		  $(Install_Flags) $(Install_Target) || exit 1 ; \
 	done
 	$(_v) rm -rf $(DSTROOT)
 	$(_v) mkdir -p $(DSTROOT)
@@ -358,7 +364,7 @@
 build-cross: configure-cross
 	$(_v) for arch in $(RC_ARCHS) ; do \
 		echo "Building (Cross) for $$arch..." && \
-		$(MAKE) -j$(SYSCTL) -C $(OBJROOT)/$$arch $(Build_Target) CFLAGS="-arch $$arch $(CFLAGS)" CXXFLAGS="-arch $$arch $(CXXFLAGS)" OPTIONAL_DIRS= CLANG_NO_RUNTIME=1 || exit 1; \
+		$(MAKE) -j$(SYSCTL) -C $(OBJROOT)/$$arch $(Build_Target) CFLAGS="-arch $$arch $(CFLAGS)" CXXFLAGS="-arch $$arch $(CXXFLAGS)" OPTIONAL_DIRS= || exit 1; \
 	done
 
 configure-cross: setup-tools-cross