[llvm-branch-commits] [cfe-branch] r106655 - in /cfe/branches/Apple/cremebrulee-IB: ClangBNI.mk Makefile

[Daniel Dunbar]

Author: ddunbar
Date: Wed Jun 23 13:22:50 2010
New Revision: 106655

URL: http://llvm.org/viewvc/llvm-project?rev=106655&view=rev
Log:
Sync with Whitney makefiles.

Modified:
    cfe/branches/Apple/cremebrulee-IB/ClangBNI.mk
    cfe/branches/Apple/cremebrulee-IB/Makefile

Modified: cfe/branches/Apple/cremebrulee-IB/ClangBNI.mk
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/Apple/cremebrulee-IB/ClangBNI.mk?rev=106655&r1=106654&r2=106655&view=diff
==============================================================================
--- cfe/branches/Apple/cremebrulee-IB/ClangBNI.mk (original)
+++ cfe/branches/Apple/cremebrulee-IB/ClangBNI.mk Wed Jun 23 13:22:50 2010
@@ -204,6 +204,8 @@
 # Set install and build targets.
 Install_Target = $(Clang_Make_Variables) $(LLVM_Install_Target)
 Build_Target = $(Clang_Make_Variables) $(Clang_Build_Target)
+Install_Target_Stage1 = $(Clang_Make_Variables) install-clang
+Build_Target_Stage1 = $(Clang_Make_Variables) clang-only
 
 # Set default target.
 
@@ -222,9 +224,9 @@
 	  false; \
 	fi
 	svn rm -m 'Update.' $(SVN_CLANG)/src
-	svn cp -m 'Update.' $(SVN_BASE)/llvm/branches/Apple/whitney@$(REVISION) $(SVN_CLANG)/src
-	svn cp -m 'Update.' $(SVN_BASE)/cfe/branches/Apple/whitney@$(REVISION) $(SVN_CLANG)/src/tools/clang
-	svn cp -m 'Update.' $(SVN_BASE)/compiler-rt/trunk@$(REVISION) $(SVN_CLANG)/src/projects/compiler-rt
+	svn cp -m 'Update.' $(SVN_BASE)/llvm/$(LLVM_Source_Branch)@$(REVISION) $(SVN_CLANG)/src
+	svn cp -m 'Update.' $(SVN_BASE)/cfe/$(Clang_Source_Branch)@$(REVISION) $(SVN_CLANG)/src/tools/clang
+	svn cp -m 'Update.' $(SVN_BASE)/compiler-rt/$(CompilerRT_Source_Branch)@$(REVISION) $(SVN_CLANG)/src/projects/compiler-rt
 	svn up
 
 tag-clang:
@@ -359,8 +361,8 @@
 build-clang_stage1: configure-clang_stage1
 	$(_v) for arch in $(RC_ARCHS) ; do \
 		echo "Building (Stage 1) for $$arch..." && \
-		$(MAKE) -j$(SYSCTL) -C $(OBJROOT)/stage1-$$arch clang-only || exit 1; \
-		$(MAKE) -j$(SYSCTL) -C $(OBJROOT)/stage1-$$arch install-clang || exit 1; \
+		$(MAKE) -j$(SYSCTL) -C $(OBJROOT)/stage1-$$arch $(Build_Target_Stage1) || exit 1; \
+		$(MAKE) -j$(SYSCTL) -C $(OBJROOT)/stage1-$$arch $(Install_Target_Stage1) || exit 1; \
 	done
 
 configure-clang_final: $(Final_Configure_Target)

Modified: cfe/branches/Apple/cremebrulee-IB/Makefile
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/Apple/cremebrulee-IB/Makefile?rev=106655&r1=106654&r2=106655&view=diff
==============================================================================
--- cfe/branches/Apple/cremebrulee-IB/Makefile (original)
+++ cfe/branches/Apple/cremebrulee-IB/Makefile Wed Jun 23 13:22:50 2010
@@ -12,12 +12,19 @@
 Clang_Optimize_Option  := -O2
 # Additional arbitrary compiler options.
 # NOTE: Add the following to Clang_Extra_Options to enable code completion logging: -DUDP_CODE_COMPLETION_LOGGER='\"17.224.14.219\"' -DUDP_CODE_COMPLETION_LOGGER_PORT=4080
-Clang_Extra_Options    := -g -DDISABLE_SMART_POINTERS
+Clang_Extra_Options    := -g -DDISABLE_SMART_POINTERS -DDISABLE_DEFAULT_INTEGRATED_ASSEMBLER
 # Enable use of clang++?
 Clang_Enable_CXX       := 1
 # Build all LLVM tools; not just clang?
 Clang_Build_All        := 0
 
 ##
+# Source Info
+
+LLVM_Source_Branch := trunk
+Clang_Source_Branch := trunk
+CompilerRT_Source_Branch := trunk
+
+##
 # Include build logic.
 include ClangBNI.mk