[Lldb-commits] [lldb] r284565 - Revert back to the state before r284550

[Chris Bieneman via lldb-commits]

Author: cbieneman
Date: Tue Oct 18 21:44:20 2016
New Revision: 284565

URL: http://llvm.org/viewvc/llvm-project?rev=284565&view=rev
Log:
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.

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=284565&r1=284564&r2=284565&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/make/Makefile.rules (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/make/Makefile.rules Tue Oct 18 21:44:20 2016
@@ -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