Allow LLDB to be built on a system with an installed gcc/g++ that isn't the default. I recently installed gcc-4.7/g++-4.7 on Ubuntu and tried to build by specifying:

CC=gcc-4.7 CXX=g++-4.7

as configure and make args, but it didn't work when being run with makefiles. This patch fixes that.

llvm-svn: 182158
This commit is contained in:
Greg Clayton 2013-05-17 20:56:55 +00:00
parent 01b384c978
commit 9826c3f33d
2 changed files with 2 additions and 2 deletions

View File

@ -71,7 +71,7 @@ USEDLIBS = lldbAPI.a \
# Because GCC requires RTTI enabled for lldbCore (see source/Core/Makefile) it is
# necessary to also link the clang rewriter libraries so vtable references can
# be resolved correctly, if we are building with GCC.
ifeq (g++,$(shell basename $(CXX)))
ifeq (g++,$(shell basename $(CXX) | colrm 4))
USEDLIBS += clangRewriteCore.a \
clangRewriteFrontend.a
endif

View File

@ -17,7 +17,7 @@ include $(LLDB_LEVEL)/Makefile
# (cxa_demangle.cpp) uses dynamic_cast<> and GCC (at least 4.6 and 4.7)
# complain if we try to compile it with -fno-rtti.
$(info shell basename CXX is $(shell basename $(CXX)))
ifeq (g++,$(shell basename $(CXX)))
ifeq (g++,$(shell basename $(CXX) | colrm 4))
$(ObjDir)/cxa_demangle.o: Compile.CXX := $(filter-out -fno-rtti,$(Compile.CXX)) -frtti
endif