[llvm-branch-commits] [cfe-branch] r116639 - /cfe/branches/Apple/whitney-IB/ClangBNI.mk

[Daniel Dunbar]

Author: ddunbar
Date: Fri Oct 15 18:04:31 2010
New Revision: 116639

URL: http://llvm.org/viewvc/llvm-project?rev=116639&view=rev
Log:
Put back LLVM_VERSION_INFO setting, via make variable instead of configure arg.

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

Modified: cfe/branches/Apple/whitney-IB/ClangBNI.mk
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/Apple/whitney-IB/ClangBNI.mk?rev=116639&r1=116638&r2=116639&view=diff
==============================================================================
--- cfe/branches/Apple/whitney-IB/ClangBNI.mk (original)
+++ cfe/branches/Apple/whitney-IB/ClangBNI.mk Fri Oct 15 18:04:31 2010
@@ -162,6 +162,12 @@
 $(error "invalid setting for clang enable C++: '$(Clang_Enable_CXX)'")
 endif
 
+# Set LLVM_VERSION_INFO make variable. We do this here because setting it in the
+# CC options for configure ends up breaking tests that can't be bothered to
+# quote things properly, and that is too hard to fix.
+Clang_Make_Variables += \
+  LLVM_VERSION_INFO="from Apple Clang $(Clang_Version) (build $(RC_ProjectSourceVersion))"
+
 else ifeq ($(Clang_Driver_Mode), Development)
 # ... this is the default ...
 else
@@ -208,10 +214,6 @@
 # Set extra compile options.
 Extra_Options := $(Clang_Extra_Options)
 
-# Disabled for now, stupid LLVM tests mess up with embedded quotes.
-#
-#Extra_Options += -DLLVM_VERSION_INFO='\"from Apple Clang $(Clang_Version) (build $(SourceVersion))\"'
-
 # Set configure flags.
 Common_Configure_Flags = \
 		  --enable-targets=$(LLVM_Backends) \