Skip to content

Commit 639e187

Browse files
committed
Generalizing configure openmp treatment following data.table: part 2a
1 parent 5578acc commit 639e187

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

configure

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3324,7 +3324,7 @@ if test x"${SYSKERNEL}" = x"Darwin"; then
33243324
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether R CMD SHLIB can compile OpenMP programs using '-Xclang -fopenmp'" >&5
33253325
printf %s "checking whether R CMD SHLIB can compile OpenMP programs using '-Xclang -fopenmp'... " >&6; }
33263326

3327-
PKG_CXXFLAGS=-Xclang -fopenmp PKG_LIBS="${PKG_LIBS} -lomp" "${R_HOME}/bin/R" CMD SHLIB -fopenmp test-omp.cpp >/dev/null 2>&1
3327+
CPPFLAGS="${CPPFLAGS} -Xclang -fopenmp" PKG_LIBS="${PKG_LIBS} -lomp" "${R_HOME}/bin/R" CMD SHLIB -fopenmp test-omp.cpp >/dev/null 2>&1
33283328
if test x"$?" = x"0"; then
33293329
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
33303330
printf "%s\n" "yes" >&6; }

configure.ac

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,8 @@ if test x"${SYSKERNEL}" = x"Darwin"; then
114114
if test x"${can_use_openmp}" = x"no"; then
115115
AC_MSG_CHECKING([whether R CMD SHLIB can compile OpenMP programs using '-Xclang -fopenmp'])
116116

117-
PKG_CXXFLAGS=-Xclang -fopenmp PKG_LIBS="${PKG_LIBS} -lomp" "${R_HOME}/bin/R" CMD SHLIB -fopenmp test-omp.cpp >/dev/null 2>&1
117+
# >/dev/null 2>&1
118+
PKG_CXXFLAGS="${PKG_CXXFLAGS} -Xclang -fopenmp" PKG_LIBS="${PKG_LIBS} -lomp" "${R_HOME}/bin/R" CMD SHLIB test-omp.cpp
118119
if test x"$?" = x"0"; then
119120
AC_MSG_RESULT([yes])
120121
openmp_already_works="yes"

0 commit comments

Comments
 (0)