[Lldb-commits] [lldb] r137140 - in /lldb/trunk/test: lang/objc/self/Makefile make/Makefile.rules

[Johnny Chen]

Author: johnny
Date: Tue Aug  9 15:07:16 2011
New Revision: 137140

URL: http://llvm.org/viewvc/llvm-project?rev=137140&view=rev
Log:
Simplify lang/objc/self/Makefile, plus it's wrong. :-)
For Makefile.rules, the modification of CFLAGS (addition of -arch $(ARCH) for Darwin) needs to come before
the consuming of CFLAGS, not after.

Modified:
    lldb/trunk/test/lang/objc/self/Makefile
    lldb/trunk/test/make/Makefile.rules

Modified: lldb/trunk/test/lang/objc/self/Makefile
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/lang/objc/self/Makefile?rev=137140&r1=137139&r2=137140&view=diff
==============================================================================
--- lldb/trunk/test/lang/objc/self/Makefile (original)
+++ lldb/trunk/test/lang/objc/self/Makefile Tue Aug  9 15:07:16 2011
@@ -1,6 +1,6 @@
 LEVEL = ../../../make
 
 OBJC_SOURCES := main.m
-LDFLAGS := $(CFLAGS) -lobjc -framework Foundation
+LD_EXTRAS ?= -framework Foundation
 
 include $(LEVEL)/Makefile.rules

Modified: lldb/trunk/test/make/Makefile.rules
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/make/Makefile.rules?rev=137140&r1=137139&r2=137140&view=diff
==============================================================================
--- lldb/trunk/test/make/Makefile.rules (original)
+++ lldb/trunk/test/make/Makefile.rules Tue Aug  9 15:07:16 2011
@@ -38,13 +38,6 @@
 #----------------------------------------------------------------------
 CFLAGS ?= -gdwarf-2 -O0
 CFLAGS += $(FRAMEWORK_INCLUDES)
-CXXFLAGS +=$(CFLAGS)
-LD = $(CC)
-LDFLAGS ?= $(CFLAGS)
-LDFLAGS += $(LD_EXTRAS)
-OBJECTS =
-EXE ?= a.out
-
 ifeq "$(OS)" "Darwin"
 	CFLAGS += -arch $(ARCH)
 	DS := /usr/bin/dsymutil
@@ -52,6 +45,13 @@
 	DSYM = $(EXE).dSYM
 endif
 
+CXXFLAGS +=$(CFLAGS)
+LD = $(CC)
+LDFLAGS ?= $(CFLAGS)
+LDFLAGS += $(LD_EXTRAS)
+OBJECTS =
+EXE ?= a.out
+
 ifneq "$(DYLIB_NAME)" ""
 	ifeq "$(OS)" "Darwin"
 		DYLIB_FILENAME = lib$(DYLIB_NAME).dylib