OSchip
/
llvm-project
mirror of https://github.com/THU-DSP-LAB/llvm-project.git
13
0
Fork 6
Code Issues Packages Projects Releases Wiki Activity

Fix Makefiles in the data-formatter-stl tests 

- specify compiler flag -stdlib=libstdc++ only if using clang (not supported in gcc)

llvm-svn: 183333
This commit is contained in:
Daniel Malea 2013-06-05 19:32:34 +00:00
parent 741cebbea0
commit c7ffa7a958
7 changed files with 28 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lldb/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/iterator/Makefile
View File

@ -2,7 +2,7 @@ LEVEL = ../../../../../make
CXX_SOURCES := main.cpp CXX_SOURCES := main.cpp
include $(LEVEL)/Makefile.rules CFLAGS_EXTRAS := -O0
USE_LIBSTDCPP := 1
CXXFLAGS += -stdlib=libstdc++ -O0 include $(LEVEL)/Makefile.rules
LDFLAGS += -stdlib=libstdc++

6
lldb/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/list/Makefile
View File

@ -2,7 +2,7 @@ LEVEL = ../../../../../make
CXX_SOURCES := main.cpp CXX_SOURCES := main.cpp
include $(LEVEL)/Makefile.rules CFLAGS_EXTRAS := -O0
USE_LIBSTDCPP := 1
CXXFLAGS += -stdlib=libstdc++ -O0 include $(LEVEL)/Makefile.rules
LDFLAGS += -stdlib=libstdc++

5
lldb/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/map/Makefile
View File

@ -2,7 +2,6 @@ LEVEL = ../../../../../make
CXX_SOURCES := main.cpp CXX_SOURCES := main.cpp
include $(LEVEL)/Makefile.rules USE_LIBSTDCPP := 1
CXXFLAGS += -stdlib=libstdc++ -O0 include $(LEVEL)/Makefile.rules
LDFLAGS += -stdlib=libstdc++

6
lldb/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/string/Makefile
View File

@ -2,7 +2,7 @@ LEVEL = ../../../../../make
CXX_SOURCES := main.cpp CXX_SOURCES := main.cpp
include $(LEVEL)/Makefile.rules CFLAGS_EXTRAS := -O0
USE_LIBSTDCPP := 1
CXXFLAGS += -stdlib=libstdc++ -O0 include $(LEVEL)/Makefile.rules
LDFLAGS += -stdlib=libstdc++

9
lldb/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/vbool/Makefile
View File

@ -2,10 +2,7 @@ LEVEL = ../../../../../make
CXX_SOURCES := main.cpp CXX_SOURCES := main.cpp
include $(LEVEL)/Makefile.rules CFLAGS_EXTRAS := -O0
USE_LIBSTDCPP := 1
CXXFLAGS += -O0 include $(LEVEL)/Makefile.rules
ifeq (,$(findstring gcc,$(CC)))
CXXFLAGS += -stdlib=libstdc++
LDFLAGS += -stdlib=libstdc++
endif

6
lldb/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/vector/Makefile
View File

@ -2,7 +2,7 @@ LEVEL = ../../../../../make
CXX_SOURCES := main.cpp CXX_SOURCES := main.cpp
include $(LEVEL)/Makefile.rules CXXFLAGS := -O0
USE_LIBSTDCPP := 1
CXXFLAGS += -stdlib=libstdc++ -O0 include $(LEVEL)/Makefile.rules
LDFLAGS += -stdlib=libstdc++

11
lldb/test/make/Makefile.rules
View File

@ -111,6 +111,17 @@ cxx_compiler = $(if $(findstring clang,$(1)), $(subst clang,clang++,$(1)), $(if
# Function that returns the C++ linker, given $(CC) as arg. # Function that returns the C++ linker, given $(CC) as arg.
cxx_linker = $(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)), $(subst gcc,g++,$(1))))) cxx_linker = $(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)), $(subst gcc,g++,$(1)))))
#----------------------------------------------------------------------
# C++ standard library options
#----------------------------------------------------------------------
ifeq (1,$(USE_LIBSTDCPP))
# Clang requires an extra flag: -stdlib=libstdc++
ifneq (,$(findstring clang,$(CC)))
CFLAGS += -stdlib=libstdc++
LDFLAGS += -stdlib=libstdc++
endif
endif
#---------------------------------------------------------------------- #----------------------------------------------------------------------
# dylib settings # dylib settings
#---------------------------------------------------------------------- #----------------------------------------------------------------------