[cfe-commits] r63063 - in /cfe/tags/Apple/clang: GNUSource.make Makefile

[Mike Stump]

Author: mrs
Date: Mon Jan 26 17:04:30 2009
New Revision: 63063

URL: http://llvm.org/viewvc/llvm-project?rev=63063&view=rev
Log:
Enable --disable-assertions, disable all targets except for x86, don't
let others set Environment, as it isn't used anyway, use full path for
g++ to mirror CC better.

Modified:
    cfe/tags/Apple/clang/GNUSource.make
    cfe/tags/Apple/clang/Makefile

Modified: cfe/tags/Apple/clang/GNUSource.make
URL: http://llvm.org/viewvc/llvm-project/cfe/tags/Apple/clang/GNUSource.make?rev=63063&r1=63062&r2=63063&view=diff

==============================================================================
--- cfe/tags/Apple/clang/GNUSource.make (original)
+++ cfe/tags/Apple/clang/GNUSource.make Mon Jan 26 17:04:30 2009
@@ -88,7 +88,7 @@
 Configure = $(Sources)/configure
 endif
 
-Environment += CC="$(CC) -arch $$arch" CXX="$(CXX) -arch $$arch" 
+Environment = CC="$(CC) -arch $$arch" CXX="$(CXX) -arch $$arch" 
 
 CC_Archs      = # set by CC
 # FIXME: Common.make shouldn't be setting this in the first place.

Modified: cfe/tags/Apple/clang/Makefile
URL: http://llvm.org/viewvc/llvm-project/cfe/tags/Apple/clang/Makefile?rev=63063&r1=63062&r2=63063&view=diff

==============================================================================
--- cfe/tags/Apple/clang/Makefile (original)
+++ cfe/tags/Apple/clang/Makefile Mon Jan 26 17:04:30 2009
@@ -7,18 +7,16 @@
 UserType              = Developer
 ToolType              = Commands
 Install_Prefix	      = /Developer/usr
-Extra_Configure_Flags = --enable-targets=powerpc,x86,arm,cbe,cpp \
-			--enable-optimized --disable-doxygen \
+Extra_Configure_Flags = --enable-targets=x86 \
+			--enable-optimized --disable-assertions --disable-doxygen \
 			$(HOST_TARGET_FLAGS)
 Extra_CC_Flags        = -mdynamic-no-pic
 GnuAfterInstall       = post-install install-plist
-CXX = g++
-CXX = g++
 
 # It's a GNU Source project
 include ./GNUSource.make
 
-CXX := g++
+CXX := /usr/bin/g++
 
 # Automatic Extract & Patch
 #AEP            = YES