Skip to content

Commit 229c08b

Browse files
committed
try to help detection of intel compiler
1 parent 0da9610 commit 229c08b

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

tools/config/configure.R

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ if (file.exists(makevars)) {
2424

2525
# Figure out the appropriate CXX prefix for the current
2626
# version of R + configuration.
27-
cxx <- NULL
27+
cxx <- "/usr/bin/c++"
2828
candidates <- c("CXX11", "CXX1X", "CXX")
2929
for (candidate in candidates) {
3030
value <- r_cmd_config(candidate)
@@ -34,6 +34,11 @@ for (candidate in candidates) {
3434
}
3535
}
3636

37+
# Check for the intel compiler
38+
if (any(grepl("icpc", cxx, fixed = TRUE))) {
39+
define(COMPILER = "icpc")
40+
}
41+
3742
# work around issue with '-Werror=format-security' being specified without
3843
# a prior '-Wformat', which makes gcc angry
3944
cxxflags <- read_r_config(sprintf("%sFLAGS", cxx), envir = NULL)[[1]]

0 commit comments

Comments
 (0)