RcppCore
diff --git a/‎src/Makevars.in
Copy file name to clipboardExpand all lines: src/Makevars.in
+3-1Lines changed: 3 additions & 1 deletion b/‎src/Makevars.in
Copy file name to clipboardExpand all lines: src/Makevars.in
+3-1Lines changed: 3 additions & 1 deletion
diff --git a/‎tools/config/configure.R
Copy file name to clipboardExpand all lines: tools/config/configure.R
+3-1Lines changed: 3 additions & 1 deletion b/‎tools/config/configure.R
Copy file name to clipboardExpand all lines: tools/config/configure.R
+3-1Lines changed: 3 additions & 1 deletion
@@ -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)
 
@@ -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")
       }
    }
 }
+
Original file line number	Diff line number	Diff line change
`@@ -84,12 +84,14 @@ if (getRversion() < "4.0") {`
`84`	`84`	`}`
`85`	`85`
`86`	`86`	`# on Solaris, check if we're using gcc or g++`
	`87`	`+define(COMPILER = "")`
`87`	`88`	`if (Sys.info()[["sysname"]] == "SunOS") {`
`88`	`89`	`cxx <- r_cmd_config("CXX")`
`89`	`90`	`version <- system(paste(cxx, "--version"), intern = TRUE)`
`90`	`91`	`for (compiler in c("gcc", "g++")) {`
`91`	`92`	`if (any(grepl(compiler, version, fixed = TRUE))) {`
`92`		`- define(COMPILER = "compiler=gcc")`
	`93`	`+ define(COMPILER = "gcc")`
`93`	`94`	`}`
`94`	`95`	`}`
`95`	`96`	`}`
	`97`	`+`