diff options
| author | Chris Bieneman <beanz@apple.com> | 2016-10-19 02:44:20 +0000 |
|---|---|---|
| committer | Chris Bieneman <beanz@apple.com> | 2016-10-19 02:44:20 +0000 |
| commit | e0dcd6d7f4b3beb8c32a2f3b2cacfcea5cbf86a8 (patch) | |
| tree | a8351abcea8c466801111d0d38b1d31a291c3674 /lldb/packages/Python/lldbsuite/test | |
| parent | 716ac7684c4c952b55b44115c752cd552e13adbd (diff) | |
| download | bcm5719-llvm-e0dcd6d7f4b3beb8c32a2f3b2cacfcea5cbf86a8.tar.gz bcm5719-llvm-e0dcd6d7f4b3beb8c32a2f3b2cacfcea5cbf86a8.zip | |
Revert back to the state before r284550
This patch is causing a lot of issues on bots that I didn't see in local testing. I'm going to have to work on this. Reverting for now while I sort it out.
llvm-svn: 284565
Diffstat (limited to 'lldb/packages/Python/lldbsuite/test')
| -rw-r--r-- | lldb/packages/Python/lldbsuite/test/make/Makefile.rules | 51 |
1 files changed, 18 insertions, 33 deletions
diff --git a/lldb/packages/Python/lldbsuite/test/make/Makefile.rules b/lldb/packages/Python/lldbsuite/test/make/Makefile.rules index 0451b23e23f..910dc6737c7 100644 --- a/lldb/packages/Python/lldbsuite/test/make/Makefile.rules +++ b/lldb/packages/Python/lldbsuite/test/make/Makefile.rules @@ -242,27 +242,27 @@ ifneq "$(DYLIB_NAME)" "" endif # Function that returns the counterpart C++ compiler, given $(CC) as arg. -cxx_compiler_notdir = $(if $(findstring icc,$(1)), \ - $(subst icc,icpc,$(1)), \ - $(if $(findstring llvm-gcc,$(1)), \ - $(subst llvm-gcc,llvm-g++,$(1)), \ - $(if $(findstring gcc,$(1)), \ - $(subst gcc,g++,$(1)), \ - $(subst cc,c++,$(1))))) +cxx_compiler_notdir = $(if $(findstring clang,$(1)), \ + $(subst clang,clang++,$(1)), \ + $(if $(findstring icc,$(1)), \ + $(subst icc,icpc,$(1)), \ + $(if $(findstring llvm-gcc,$(1)), \ + $(subst llvm-gcc,llvm-g++,$(1)), \ + $(if $(findstring gcc,$(1)), \ + $(subst gcc,g++,$(1)), \ + $(subst cc,c++,$(1)))))) cxx_compiler = $(if $(findstring /,$(1)),$(join $(dir $(1)), $(call cxx_compiler_notdir,$(notdir $(1)))),$(call cxx_compiler_notdir,$(1))) -ifeq ($(findstring clang, $(cxx_compiler)), clang) - CXXFLAGS += --driver-mode=g++ -endif - # Function that returns the C++ linker, given $(CC) as arg. -cxx_linker_notdir = $(if $(findstring icc,$(1)), \ - $(subst icc,icpc,$(1)), \ - $(if $(findstring llvm-gcc,$(1)), \ - $(subst llvm-gcc,llvm-g++,$(1)), \ - $(if $(findstring gcc,$(1)), \ - $(subst gcc,g++,$(1)), \ - $(subst cc,c++,$(1))))) +cxx_linker_notdir = $(if $(findstring clang,$(1)), \ + $(subst clang,clang++,$(1)), \ + $(if $(findstring icc,$(1)), \ + $(subst icc,icpc,$(1)), \ + $(if $(findstring llvm-gcc,$(1)), \ + $(subst llvm-gcc,llvm-g++,$(1)), \ + $(if $(findstring gcc,$(1)), \ + $(subst gcc,g++,$(1)), \ + $(subst cc,c++,$(1)))))) cxx_linker = $(if $(findstring /,$(1)),$(join $(dir $(1)), $(call cxx_linker_notdir,$(notdir $(1)))),$(call cxx_linker_notdir,$(1))) ifneq "$(OS)" "Darwin" @@ -354,9 +354,6 @@ ifneq "$(strip $(DYLIB_CXX_SOURCES))" "" DYLIB_OBJECTS +=$(strip $(DYLIB_CXX_SOURCES:.cpp=.o)) CXX = $(call cxx_compiler,$(CC)) LD = $(call cxx_linker,$(CC)) - ifeq ($(findstring clang, $(cxx_linker)), clang) - LDFLAGS += --driver-mode=g++ - endif endif #---------------------------------------------------------------------- @@ -380,9 +377,6 @@ endif ifneq "$(strip $(CXX_SOURCES))" "" OBJECTS +=$(strip $(CXX_SOURCES:.cpp=.o)) CXX = $(call cxx_compiler,$(CC)) - ifeq ($(findstring clang, $(cxx_linker)), clang) - LDFLAGS += --driver-mode=g++ - endif LD = $(call cxx_linker,$(CC)) endif @@ -401,9 +395,6 @@ ifneq "$(strip $(OBJCXX_SOURCES))" "" OBJECTS +=$(strip $(OBJCXX_SOURCES:.mm=.o)) CXX = $(call cxx_compiler,$(CC)) LD = $(call cxx_linker,$(CC)) - ifeq ($(findstring clang, $(cxx_linker)), clang) - LDFLAGS += --driver-mode=g++ - endif ifeq "$(findstring lobjc,$(LDFLAGS))" "" LDFLAGS +=-lobjc endif @@ -423,9 +414,6 @@ ifneq "$(strip $(ARCHIVE_CXX_SOURCES))" "" ARCHIVE_OBJECTS +=$(strip $(ARCHIVE_CXX_SOURCES:.cpp=.o)) CXX = $(call cxx_compiler,$(CC)) LD = $(call cxx_linker,$(CC)) - ifeq ($(findstring clang, $(cxx_linker)), clang) - LDFLAGS += --driver-mode=g++ - endif endif #---------------------------------------------------------------------- @@ -443,9 +431,6 @@ ifneq "$(strip $(ARCHIVE_OBJCXX_SOURCES))" "" ARCHIVE_OBJECTS +=$(strip $(ARCHIVE_OBJCXX_SOURCES:.mm=.o)) CXX = $(call cxx_compiler,$(CC)) LD = $(call cxx_linker,$(CC)) - ifeq ($(findstring clang, $(cxx_linker)), clang) - LDFLAGS += --driver-mode=g++ - endif ifeq "$(findstring lobjc,$(LDFLAGS))" "" LDFLAGS +=-lobjc endif |
