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

[Daniel Dunbar]

Author: ddunbar
Date: Fri Jun 25 18:43:49 2010
New Revision: 106915

URL: http://llvm.org/viewvc/llvm-project?rev=106915&view=rev
Log:
Explicitly set CLANG_VERSION when building Apple stylin'.

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=106915&r1=106914&r2=106915&view=diff
==============================================================================
--- cfe/branches/Apple/whitney-IB/ClangBNI.mk (original)
+++ cfe/branches/Apple/whitney-IB/ClangBNI.mk Fri Jun 25 18:43:49 2010
@@ -94,7 +94,12 @@
 # B&I Build Logic
 ##
 
-# Selection assertions mode.
+# Require Clang_Version to be set.
+ifeq ($(Clang_Version),)
+$(error "invalid setting for clang version: '$(Clang_Version)'")
+endif
+
+# Select assertions mode.
 ifeq ($(Clang_Use_Assertions), 1)
 Assertions_Configure_Flag :=  --enable-assertions
 else ifeq ($(Clang_Use_Assertions), 0)
@@ -114,6 +119,7 @@
 
 # Set makefile variables to pass during build and install.
 Clang_Make_Variables := $(Extra_Make_Variables) KEEP_SYMBOLS=1 CLANG_VENDOR=Apple
+Clang_Make_Variables += CLANG_VERSION=$(Clang_Version)
 ifeq ($(Clang_Driver_Mode), Production)
 Clang_Make_Variables += CLANG_IS_PRODUCTION=1
 

Modified: cfe/branches/Apple/whitney-IB/Makefile
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/Apple/whitney-IB/Makefile?rev=106915&r1=106914&r2=106915&view=diff
==============================================================================
--- cfe/branches/Apple/whitney-IB/Makefile (original)
+++ cfe/branches/Apple/whitney-IB/Makefile Fri Jun 25 18:43:49 2010
@@ -5,7 +5,7 @@
 # LLVM/Clang default configuration.
 
 # Select default assertion mode, valid values are '0' and '1'.
-Clang_Use_Assertions   := 0
+Clang_Use_Assertions   := 1
 # Select clang driver mode, valid values are 'Production' and 'Development'.
 Clang_Driver_Mode      := Production
 # Select optimization flags to use.
@@ -16,6 +16,8 @@
 Clang_Enable_CXX       := 1
 # Build all LLVM tools; not just clang?
 Clang_Build_All        := 0
+# Set the Clang version.
+Clang_Version          := 2.0
 
 ##
 # Source Info