diff options
| author | Chris Bieneman <beanz@apple.com> | 2016-10-19 00:13:56 +0000 |
|---|---|---|
| committer | Chris Bieneman <beanz@apple.com> | 2016-10-19 00:13:56 +0000 |
| commit | 87378bd21e658b272ec794ab216969abcfa2314f (patch) | |
| tree | be52aaed9a897b2829d32ae2ab12baa058ac390f /lldb/packages/Python/lldbsuite/test/make | |
| parent | 95b1a434d2d2bc03ea6f8470a98189f8429c9720 (diff) | |
| download | bcm5719-llvm-87378bd21e658b272ec794ab216969abcfa2314f.tar.gz bcm5719-llvm-87378bd21e658b272ec794ab216969abcfa2314f.zip | |
Fixing the linux bots I broke in r284550
Need to gate cxx linker adding driver-mode flag based on the linker being clang.
llvm-svn: 284555
Diffstat (limited to 'lldb/packages/Python/lldbsuite/test/make')
| -rw-r--r-- | lldb/packages/Python/lldbsuite/test/make/Makefile.rules | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/lldb/packages/Python/lldbsuite/test/make/Makefile.rules b/lldb/packages/Python/lldbsuite/test/make/Makefile.rules index 4d343cd68d2..68106cf1fb7 100644 --- a/lldb/packages/Python/lldbsuite/test/make/Makefile.rules +++ b/lldb/packages/Python/lldbsuite/test/make/Makefile.rules @@ -354,7 +354,9 @@ ifneq "$(strip $(DYLIB_CXX_SOURCES))" "" DYLIB_OBJECTS +=$(strip $(DYLIB_CXX_SOURCES:.cpp=.o)) CXX = $(call cxx_compiler,$(CC)) LD = $(call cxx_linker,$(CC)) - LDFLAGS += --driver-mode=g++ + ifeq ($(findstring clang, $(cxx_linker)), clang) + LDFLAGS += --driver-mode=g++ + endif endif #---------------------------------------------------------------------- @@ -378,7 +380,9 @@ endif ifneq "$(strip $(CXX_SOURCES))" "" OBJECTS +=$(strip $(CXX_SOURCES:.cpp=.o)) CXX = $(call cxx_compiler,$(CC)) - LDFLAGS += --driver-mode=g++ + ifeq ($(findstring clang, $(cxx_linker)), clang) + LDFLAGS += --driver-mode=g++ + endif LD = $(call cxx_linker,$(CC)) endif @@ -397,7 +401,9 @@ ifneq "$(strip $(OBJCXX_SOURCES))" "" OBJECTS +=$(strip $(OBJCXX_SOURCES:.mm=.o)) CXX = $(call cxx_compiler,$(CC)) LD = $(call cxx_linker,$(CC)) - LDFLAGS += --driver-mode=g++ + ifeq ($(findstring clang, $(cxx_linker)), clang) + LDFLAGS += --driver-mode=g++ + endif ifeq "$(findstring lobjc,$(LDFLAGS))" "" LDFLAGS +=-lobjc endif |
