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

[Daniel Dunbar]

Author: ddunbar
Date: Wed Jun 23 13:17:38 2010
New Revision: 106645

URL: http://llvm.org/viewvc/llvm-project?rev=106645&view=rev
Log:
Factor out source branches, and disable integrated assembler by default for now.

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

Modified: cfe/branches/Apple/whitney-IB/ClangBNI.mk
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/Apple/whitney-IB/ClangBNI.mk?rev=106645&r1=106644&r2=106645&view=diff
==============================================================================
--- cfe/branches/Apple/whitney-IB/ClangBNI.mk (original)
+++ cfe/branches/Apple/whitney-IB/ClangBNI.mk Wed Jun 23 13:17:38 2010
@@ -224,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:

Modified: cfe/branches/Apple/whitney-IB/Makefile
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/Apple/whitney-IB/Makefile?rev=106645&r1=106644&r2=106645&view=diff
==============================================================================
--- cfe/branches/Apple/whitney-IB/Makefile (original)
+++ cfe/branches/Apple/whitney-IB/Makefile Wed Jun 23 13:17:38 2010
@@ -11,12 +11,19 @@
 # Select optimization flags to use.
 Clang_Optimize_Option  := -O2
 # Additional arbitrary compiler options.
-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