Do not specify CXXSTD for recent R versions

ropensci · Jan 4, 2024 · fd677f7 · fd677f7
1 parent db2edaf
commit fd677f7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/src/Makevars.ucrt b/src/Makevars.ucrt
@@ -0,0 +1,2 @@
+PKG_CXXFLAGS = $(SHLIB_OPENMP_CXXFLAGS)
+PKG_LIBS = $(SHLIB_OPENMP_CXXFLAGS) $(LAPACK_LIBS) $(BLAS_LIBS) $(FLIBS)
diff --git a/src/Makevars.win b/src/Makevars.win
@@ -1,3 +1,5 @@
+# This file will only be used on R < 4.2.
+# Newer versions of R will prefer Makevars.ucrt
 CXX_STD = CXX14
 PKG_CXXFLAGS = $(SHLIB_OPENMP_CXXFLAGS)
 PKG_LIBS = $(SHLIB_OPENMP_CXXFLAGS) $(LAPACK_LIBS) $(BLAS_LIBS) $(FLIBS)
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		PKG_CXXFLAGS = $(SHLIB_OPENMP_CXXFLAGS)
		PKG_LIBS = $(SHLIB_OPENMP_CXXFLAGS) $(LAPACK_LIBS) $(BLAS_LIBS) $(FLIBS)