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

[Mike Stump]

Author: mrs
Date: Fri Mar 27 11:54:16 2009
New Revision: 67851

URL: http://llvm.org/viewvc/llvm-project?rev=67851&view=rev
Log:
Don't try and pass make flags as environment variables, and ensure
we build before the unit tests.

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=67851&r1=67850&r2=67851&view=diff

==============================================================================
--- cfe/tags/Apple/clang/GNUSource.make (original)
+++ cfe/tags/Apple/clang/GNUSource.make Fri Mar 27 11:54:16 2009
@@ -88,7 +88,7 @@
 Configure = $(Sources)/configure
 endif
 
-Environment = CC="$(CC) -arch $$arch" CXX="$(CXX) -arch $$arch" KEEP_SYMBOLS=1 -s --no-print-directory
+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=67851&r1=67850&r2=67851&view=diff

==============================================================================
--- cfe/tags/Apple/clang/Makefile (original)
+++ cfe/tags/Apple/clang/Makefile Fri Mar 27 11:54:16 2009
@@ -34,8 +34,8 @@
 AEP_ExtractOption = z
 endif
 
-Install_Target = install-clang
-Build_Target = clang-only
+Install_Target = KEEP_SYMBOLS=1 -s --no-print-directory install-clang
+Build_Target = KEEP_SYMBOLS=1 -s --no-print-directory clang-only
 
 # Extract the source.
 install_source::
@@ -103,9 +103,9 @@
 	cd ../build/clang.roots/clang~obj/i386 && $(SUDO) make check && echo PASS: check-i386
 check-x86_64: llvm-binaries-x86_64
 	cd ../build/clang.roots/clang~obj/x86_64 && $(SUDO) make check && echo PASS: check-x86_64
-unittests-i386:
+unittests-i386: llvm-binaries-i386
 	cd ../build/clang.roots/clang~obj/i386 && $(SUDO) make unittests && echo PASS: unittests-i386
-unittests-x86_64:
+unittests-x86_64: llvm-binaries-x86_64
 	cd ../build/clang.roots/clang~obj/x86_64 && $(SUDO) make unittests && echo PASS: unittests-x86_64
 clang-i386: llvm-binaries-i386
 	cd ../build/clang.roots/clang~obj/i386/tools/clang && { $(SUDO) make VERBOSE=0 test && echo PASS: clang-i386 || { echo FAIL: clang-i386; make report; } }