Merge pull request #377 from RcppCore/bugfix/issue375

Ensure openmp propagates in the 'found' case (closes #375)
RcppCore · May 11, 2022 · 1a91f52 · 1a91f52
2 parents 2328321 + 2c82f61
commit 1a91f52
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 0 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,7 @@
+2022-05-11  Dirk Eddelbuettel  <edd@debian.org>
+
+	* configure.ac: Ensure OpenMP is propagated in the 'found' case
+
 2022-04-14  Dirk Eddelbuettel  <edd@debian.org>
 
 	* DESCRIPTION (Version, Date): RcppArmadillo 0.11.0.1.0

diff --git a/configure b/configure
@@ -2888,6 +2888,7 @@ arma_have_openmp="#define ARMA_DONT_USE_OPENMP 1"
 
 if test x"${openmp_already_works}" = x"yes"; then
     arma_have_openmp="#define ARMA_USE_OPENMP 1"
+    openmp_flag='$(SHLIB_OPENMP_CXXFLAGS)'
 fi
 
 if test x"${can_use_openmp}" = x"yes"; then

diff --git a/configure.ac b/configure.ac
@@ -184,6 +184,7 @@ arma_have_openmp="#define ARMA_DONT_USE_OPENMP 1"
 
 if test x"${openmp_already_works}" = x"yes"; then
     arma_have_openmp="#define ARMA_USE_OPENMP 1"
+    openmp_flag='$(SHLIB_OPENMP_CXXFLAGS)'
 fi
 
 if test x"${can_use_openmp}" = x"yes"; then