diff options
| author | Johnny Chen <johnny.chen@apple.com> | 2011-08-09 20:07:16 +0000 |
|---|---|---|
| committer | Johnny Chen <johnny.chen@apple.com> | 2011-08-09 20:07:16 +0000 |
| commit | 53e2edbc5c627eb6e77cf29552d824bd21885bfa (patch) | |
| tree | 0db93e28d618d4b77b18d4e8bb0bb3f6821d11b0 | |
| parent | f60d6df8873acc6fa3086a815f04aca753867d3a (diff) | |
| download | bcm5719-llvm-53e2edbc5c627eb6e77cf29552d824bd21885bfa.tar.gz bcm5719-llvm-53e2edbc5c627eb6e77cf29552d824bd21885bfa.zip | |
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.
llvm-svn: 137140
| -rw-r--r-- | lldb/test/lang/objc/self/Makefile | 2 | ||||
| -rw-r--r-- | lldb/test/make/Makefile.rules | 14 |
2 files changed, 8 insertions, 8 deletions
diff --git a/lldb/test/lang/objc/self/Makefile b/lldb/test/lang/objc/self/Makefile index fc7449d908b..bdae30428be 100644 --- a/lldb/test/lang/objc/self/Makefile +++ b/lldb/test/lang/objc/self/Makefile @@ -1,6 +1,6 @@ LEVEL = ../../../make OBJC_SOURCES := main.m -LDFLAGS := $(CFLAGS) -lobjc -framework Foundation +LD_EXTRAS ?= -framework Foundation include $(LEVEL)/Makefile.rules diff --git a/lldb/test/make/Makefile.rules b/lldb/test/make/Makefile.rules index 59aefc749f4..78d29afdd6c 100644 --- a/lldb/test/make/Makefile.rules +++ b/lldb/test/make/Makefile.rules @@ -38,13 +38,6 @@ endif #---------------------------------------------------------------------- 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 @@ ifeq "$(OS)" "Darwin" 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 |
