From af9a42b1bb9a9602f54a23683d59f69fbf7caff5 Mon Sep 17 00:00:00 2001 From: James Lamb Date: Sat, 14 Jan 2023 21:07:53 -0600 Subject: [PATCH 1/2] [R] fix OpenMP detection on macOS --- R-package/configure | 4 +--- R-package/configure.ac | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/R-package/configure b/R-package/configure index fa84d8149874..4740b3d2e1e4 100755 --- a/R-package/configure +++ b/R-package/configure @@ -2101,8 +2101,6 @@ CXX14STD=`"${R_HOME}/bin/R" CMD config CXX14STD` CXX="${CXX14} ${CXX14STD}" CXXFLAGS=`"${R_HOME}/bin/R" CMD config CXXFLAGS` -CC=`"${R_HOME}/bin/R" CMD config CC` -CFLAGS=`"${R_HOME}/bin/R" CMD config CFLAGS` CPPFLAGS=`"${R_HOME}/bin/R" CMD config CPPFLAGS` LDFLAGS=`"${R_HOME}/bin/R" CMD config LDFLAGS` @@ -2857,7 +2855,7 @@ main (void) return 0; } _ACEOF - ${CC} -o conftest conftest.c ${CPPFLAGS} ${LDFLAGS} ${OPENMP_LIB} ${OPENMP_CXXFLAGS} 2>/dev/null && ./conftest && ac_pkg_openmp=yes + ${CXX} -o conftest conftest.cpp ${CPPFLAGS} ${LDFLAGS} ${OPENMP_LIB} ${OPENMP_CXXFLAGS} 2>/dev/null && ./conftest && ac_pkg_openmp=yes { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${ac_pkg_openmp}" >&5 printf "%s\n" "${ac_pkg_openmp}" >&6; } if test "${ac_pkg_openmp}" = no; then diff --git a/R-package/configure.ac b/R-package/configure.ac index 9cc2dca17133..47f99e939a9c 100644 --- a/R-package/configure.ac +++ b/R-package/configure.ac @@ -15,8 +15,6 @@ CXX14STD=`"${R_HOME}/bin/R" CMD config CXX14STD` CXX="${CXX14} ${CXX14STD}" CXXFLAGS=`"${R_HOME}/bin/R" CMD config CXXFLAGS` -CC=`"${R_HOME}/bin/R" CMD config CC` -CFLAGS=`"${R_HOME}/bin/R" CMD config CFLAGS` CPPFLAGS=`"${R_HOME}/bin/R" CMD config CPPFLAGS` LDFLAGS=`"${R_HOME}/bin/R" CMD config LDFLAGS` @@ -55,7 +53,7 @@ then ac_pkg_openmp=no AC_MSG_CHECKING([whether OpenMP will work in a package]) AC_LANG_CONFTEST([AC_LANG_PROGRAM([[#include ]], [[ return (omp_get_max_threads() <= 1); ]])]) - ${CC} -o conftest conftest.c ${CPPFLAGS} ${LDFLAGS} ${OPENMP_LIB} ${OPENMP_CXXFLAGS} 2>/dev/null && ./conftest && ac_pkg_openmp=yes + ${CXX} -o conftest conftest.cpp ${CPPFLAGS} ${LDFLAGS} ${OPENMP_LIB} ${OPENMP_CXXFLAGS} 2>/dev/null && ./conftest && ac_pkg_openmp=yes AC_MSG_RESULT([${ac_pkg_openmp}]) if test "${ac_pkg_openmp}" = no; then OPENMP_CXXFLAGS='' From 2f59118245242fa71b00944d4dba291f47136e46 Mon Sep 17 00:00:00 2001 From: James Lamb Date: Mon, 16 Jan 2023 11:45:02 -0600 Subject: [PATCH 2/2] add CC and CFLAGS back --- R-package/configure | 2 ++ R-package/configure.ac | 2 ++ 2 files changed, 4 insertions(+) diff --git a/R-package/configure b/R-package/configure index 4740b3d2e1e4..834cb95c2f94 100755 --- a/R-package/configure +++ b/R-package/configure @@ -2101,6 +2101,8 @@ CXX14STD=`"${R_HOME}/bin/R" CMD config CXX14STD` CXX="${CXX14} ${CXX14STD}" CXXFLAGS=`"${R_HOME}/bin/R" CMD config CXXFLAGS` +CC=`"${R_HOME}/bin/R" CMD config CC` +CFLAGS=`"${R_HOME}/bin/R" CMD config CFLAGS` CPPFLAGS=`"${R_HOME}/bin/R" CMD config CPPFLAGS` LDFLAGS=`"${R_HOME}/bin/R" CMD config LDFLAGS` diff --git a/R-package/configure.ac b/R-package/configure.ac index 47f99e939a9c..4e6cfee70c09 100644 --- a/R-package/configure.ac +++ b/R-package/configure.ac @@ -15,6 +15,8 @@ CXX14STD=`"${R_HOME}/bin/R" CMD config CXX14STD` CXX="${CXX14} ${CXX14STD}" CXXFLAGS=`"${R_HOME}/bin/R" CMD config CXXFLAGS` +CC=`"${R_HOME}/bin/R" CMD config CC` +CFLAGS=`"${R_HOME}/bin/R" CMD config CFLAGS` CPPFLAGS=`"${R_HOME}/bin/R" CMD config CPPFLAGS` LDFLAGS=`"${R_HOME}/bin/R" CMD config LDFLAGS`