fixup

Author: kevinushey

src/Makevars.in

@@ -106,7 +106,9 @@ ifeq ($(USE_TBB), Windows)
 endif
 
 # write compiler if set
-MAKE_ARGS += $(COMPILER)
+ifneq (@COMPILER@, )
+	MAKE_ARGS += compiler=@COMPILER@
+endif
 
 # For Solaris detect if this is 32-bit R on x86 and if so forward that to TBB
 ifeq ($(USE_TBB), SunOS)

tools/config/configure.R

@@ -84,12 +84,14 @@ if (getRversion() < "4.0") {
 }
 
 # on Solaris, check if we're using gcc or g++
+define(COMPILER = "")
 if (Sys.info()[["sysname"]] == "SunOS") {
    cxx <- r_cmd_config("CXX")
    version <- system(paste(cxx, "--version"), intern = TRUE)
    for (compiler in c("gcc", "g++")) {
       if (any(grepl(compiler, version, fixed = TRUE))) {
-         define(COMPILER = "compiler=gcc")
+         define(COMPILER = "gcc")
       }
    }
 }
+