Author: cbieneman
Date: Tue Oct 18 19:13:56 2016
New Revision: 284555
URL: http://llvm.org/viewvc/llvm-project?rev=284555&view=rev
Log:
Fixing the linux bots I broke in r284550
Need to gate cxx linker adding driver-mode flag based on the linker being clang.
Modified:
lldb/trunk/packages/Python/lldbsuite/test/make/Makefile.rules
Modified: lldb/trunk/packages/Python/lldbsuite/test/make/Makefile.rules
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/make/Makefile.rules?rev=284555&r1=284554&r2=284555&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/make/Makefile.rules (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/make/Makefile.rules Tue Oct 18
19:13:56 2016
@@ -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
_______________________________________________
lldb-commits mailing list
lldb-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
