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

[Daniel Dunbar]

Author: ddunbar
Date: Mon Jun 28 15:18:00 2010
New Revision: 107053

URL: http://llvm.org/viewvc/llvm-project?rev=107053&view=rev
Log:
Shuffle Clang_Enable_Bootstrap variables around, I accidentally always disabled it.

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=107053&r1=107052&r2=107053&view=diff
==============================================================================
--- cfe/branches/Apple/whitney-IB/ClangBNI.mk (original)
+++ cfe/branches/Apple/whitney-IB/ClangBNI.mk Mon Jun 28 15:18:00 2010
@@ -52,8 +52,6 @@
 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
@@ -64,6 +62,8 @@
 Default_Install_Root := /
 # Don't build compiler-rt.
 Extra_Make_Variables += CLANG_NO_RUNTIME=1
+# Never bootstrap.
+Clang_Enable_Bootstrap := 0
 
 else ifeq ($(MAKECMDGOALS),install-libclang)
 
@@ -77,6 +77,8 @@
 Extra_Make_Variables += NO_INSTALL_ARCHIVES=1
 # Use install-clang-c install target.
 LLVM_Install_Target := install-clang-c
+# Never bootstrap.
+Clang_Enable_Bootstrap := 0
 
 else
 
@@ -85,10 +87,6 @@
 # Install root links and license.
 Post_Install_RootLinks := 1
 Post_Install_OpenSourceLicense := 1
-# Enable bootstrap build.
-ifeq ($(Clang_Enable_Bootstrap),)
-Clang_Enable_Bootstrap := 1
-endif
 
 endif
 

Modified: cfe/branches/Apple/whitney-IB/Makefile
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/Apple/whitney-IB/Makefile?rev=107053&r1=107052&r2=107053&view=diff
==============================================================================
--- cfe/branches/Apple/whitney-IB/Makefile (original)
+++ cfe/branches/Apple/whitney-IB/Makefile Mon Jun 28 15:18:00 2010
@@ -18,6 +18,8 @@
 Clang_Build_All        := 0
 # Set the Clang version.
 Clang_Version          := 2.0
+# Enable bootstrap.
+Clang_Enable_Bootstrap := 1
 
 ##
 # Source Info