Substitute 'cc' with 'c++' when compiling C++ test files.

[sivachandra]

Summary

On a stock Ubuntu system CMAKE_C_COMPILER could be "/usr/bin/cc"
instead of "/usr/bin/gcc". For such cases, replace 'cc' with 'c++' when
compiling C++ test files.

[emaste]

LGTM.
We have the same issue on FreeBSD - in /usr/bin we have no gcc, but do have clang and cc, and CMake prefers the latter.

[emaste]

test/make/Makefile.rules

133–141

It'd be nice if we can line wrap these (perhaps with a trailing \) to make it a bit more readable.

[sivachandra]

Indenting per Ed Maste's suggestion.

[zturner]

This looks like the same patch as D4679, which the author never ended up submitting. Could you just confirm that the two patches are equivalent? (i.e. that the other patch does not do anything else that your patch does not do?) If the other patch does something additional, maybe you could incorporate it into your patch as well.

[sivachandra]

Yup D4679 is equivalent. Difference is the indentation format. I do not mind which should go in, but would like one of them to be in.

[sivachandra]

Does the LGTM from the previous version still stand?

[zturner]

Doesn't matter to me either. Might as well submit yours since you already have it applied locally. Just wanted to make sure there was nothing additional in D4679 that you didn't put in your patch. :)

[clayborg]

As long as linux and FreeBSD are good with this, I am good.

[sivachandra]

Closing this as Shawn had already committted this for me.

test/make/Makefile.rules

ifneq "$(DYLIB_NAME)" ""
   ifeq "$(OS)" "Darwin"
     DYLIB_FILENAME = lib$(DYLIB_NAME).dylib
   else
     DYLIB_FILENAME = lib$(DYLIB_NAME).so
   endif
 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)))
 
 #----------------------------------------------------------------------
 # Clang for Windows doesn't yet support exceptions
 #----------------------------------------------------------------------
 ifeq "$(OS)" "Windows_NT"
   ifneq (,$(findstring clang,$(CC)))
     CXXFLAGS += -fno-exceptions