From 92b1a49d2b40ccb8bc2c7c93f19c8319f95966e0 Mon Sep 17 00:00:00 2001 From: daniel Date: Tue, 22 Oct 2019 10:29:07 +0200 Subject: [PATCH] fix: Removed openMP compiler flags (clang support, macOS) --- CVE_C/src/Makevars | 15 +-------------- CVE_C/src/Makevars.win | 15 +-------------- 2 files changed, 2 insertions(+), 28 deletions(-) diff --git a/CVE_C/src/Makevars b/CVE_C/src/Makevars index d3e3f41..22ebc63 100644 --- a/CVE_C/src/Makevars +++ b/CVE_C/src/Makevars @@ -1,14 +1 @@ - -## With R 3.1.0 or later, you can uncomment the following line to tell R to -## enable compilation with C++11 (where available) -## -## Also, OpenMP support in Armadillo prefers C++11 support. However, for wider -## availability of the package we do not yet enforce this here. It is however -## recommended for client packages to set it. -## -## And with R 3.4.0, and RcppArmadillo 0.7.960.*, we turn C++11 on as OpenMP -## support within Armadillo prefers / requires it -CXX_STD = CXX11 - -PKG_CXXFLAGS = $(SHLIB_OPENMP_CXXFLAGS) -PKG_LIBS = $(SHLIB_OPENMP_CXXFLAGS) $(LAPACK_LIBS) $(BLAS_LIBS) $(FLIBS) +PKG_LIBS = $(LAPACK_LIBS) $(BLAS_LIBS) $(FLIBS) diff --git a/CVE_C/src/Makevars.win b/CVE_C/src/Makevars.win index d3e3f41..22ebc63 100644 --- a/CVE_C/src/Makevars.win +++ b/CVE_C/src/Makevars.win @@ -1,14 +1 @@ - -## With R 3.1.0 or later, you can uncomment the following line to tell R to -## enable compilation with C++11 (where available) -## -## Also, OpenMP support in Armadillo prefers C++11 support. However, for wider -## availability of the package we do not yet enforce this here. It is however -## recommended for client packages to set it. -## -## And with R 3.4.0, and RcppArmadillo 0.7.960.*, we turn C++11 on as OpenMP -## support within Armadillo prefers / requires it -CXX_STD = CXX11 - -PKG_CXXFLAGS = $(SHLIB_OPENMP_CXXFLAGS) -PKG_LIBS = $(SHLIB_OPENMP_CXXFLAGS) $(LAPACK_LIBS) $(BLAS_LIBS) $(FLIBS) +PKG_LIBS = $(LAPACK_LIBS) $(BLAS_LIBS) $(FLIBS)