This is an archive of the discontinued LLVM Phabricator instance.

Differential D4679

Makefile.rules: Translate /usr/bin/cc to /usr/bin/c++
AbandonedPublic

Authored by zturner on Jul 25 2014, 3:57 PM.

Details

Reviewers
majnemer
tfiala
Summary

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.

Diff Detail

Event Timeline

majnemer updated this revision to Diff 11902.Jul 25 2014, 3:57 PM
majnemer retitled this revision from to Makefile.rules: Translate /usr/bin/cc to /usr/bin/c++.
majnemer updated this object.
majnemer added reviewers: zturner, tfiala.
majnemer added a subscriber: Unknown Object (MLST).
majnemer added a comment.Jul 30 2014, 1:12 PM

Ping.

zturner edited edge metadata.Jul 30 2014, 1:30 PM

Looks ok to me

zturner commandeered this revision.Oct 30 2014, 12:56 PM
zturner abandoned this revision.
zturner edited reviewers, added: majnemer; removed: zturner.

Revision Contents

PathSize
test/
make/
12 lines

Diff 11902

test/make/Makefile.rules

Show First 20 Lines • Show All 105 Lines • ▼ Show 20 Linesifneq "$(DYLIB_NAME)" ""
ifeq "$(OS)" "Darwin" ifeq "$(OS)" "Darwin"
DYLIB_FILENAME = lib$(DYLIB_NAME).dylib DYLIB_FILENAME = lib$(DYLIB_NAME).dylib
else else
DYLIB_FILENAME = lib$(DYLIB_NAME).so DYLIB_FILENAME = lib$(DYLIB_NAME).so
endif endif
endif endif
# Function that returns the counterpart C++ compiler, given $(CC) as arg. # 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))) 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. # 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))) cxx_linker = $(if $(findstring /,$(1)),$(join $(dir $(1)), $(call cxx_linker_notdir,$(notdir $(1)))),$(call cxx_linker_notdir,$(1)))
#---------------------------------------------------------------------- #----------------------------------------------------------------------
# C++ standard library options # C++ standard library options
#---------------------------------------------------------------------- #----------------------------------------------------------------------
ifeq (1,$(USE_LIBSTDCPP)) ifeq (1,$(USE_LIBSTDCPP))
# Clang requires an extra flag: -stdlib=libstdc++ # Clang requires an extra flag: -stdlib=libstdc++
ifneq (,$(findstring clang,$(CC))) ifneq (,$(findstring clang,$(CC)))
▲ Show 20 Lines • Show All 268 Lines • Show Last 20 Lines