Hi zturner, tfiala, The Makefile.rules file contains logic to transform various C-compilers to their respective C++-compiler. Add additional logic to handle the case where CC is /usr/bin/cc.
http://reviews.llvm.org/D4679 Files: test/make/Makefile.rules Index: test/make/Makefile.rules =================================================================== --- test/make/Makefile.rules +++ test/make/Makefile.rules @@ -111,11 +111,19 @@ endif # Function that returns the counterpart C++ compiler, given $(CC) as arg. -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)), $(subst gcc,g++,$(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))) # Function that returns the C++ linker, given $(CC) as arg. -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)), $(subst gcc,g++,$(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))) #----------------------------------------------------------------------
Index: test/make/Makefile.rules =================================================================== --- test/make/Makefile.rules +++ test/make/Makefile.rules @@ -111,11 +111,19 @@ endif # Function that returns the counterpart C++ compiler, given $(CC) as arg. -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)), $(subst gcc,g++,$(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))) # Function that returns the C++ linker, given $(CC) as arg. -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)), $(subst gcc,g++,$(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))) #----------------------------------------------------------------------
_______________________________________________ lldb-commits mailing list [email protected] http://lists.cs.uiuc.edu/mailman/listinfo/lldb-commits
