diff --git a/config.log b/config.log new file mode 100644 index 00000000..def64b92 --- /dev/null +++ b/config.log @@ -0,0 +1,18 @@ +0.29.2 +3 +using C compiler: ‘Apple clang version 15.0.0 (clang-1500.1.0.2.5)’ +using SDK: ‘’ +clang -arch arm64 -I"/Library/Frameworks/R.framework/Resources/include" -DNDEBUG -I/opt/R/arm64/include -fPIC -falign-functions=64 -Wall -g -O2 -c test-omp.c -o test-omp.o +test-omp.c:1:10: fatal error: 'omp.h' file not found +#include + ^~~~~~~ +1 error generated. +make: *** [test-omp.o] Error 1 +using C compiler: ‘Apple clang version 15.0.0 (clang-1500.1.0.2.5)’ +using SDK: ‘’ +clang -arch arm64 -I"/Library/Frameworks/R.framework/Resources/include" -DNDEBUG -I/opt/R/arm64/include -fPIC -falign-functions=64 -Wall -g -O2 -c test-omp.c -o test-omp.o +test-omp.c:1:10: fatal error: 'omp.h' file not found +#include + ^~~~~~~ +1 error generated. +make: *** [test-omp.o] Error 1 diff --git a/configure b/configure index 8d0d7404..22560430 100755 --- a/configure +++ b/configure @@ -85,7 +85,7 @@ EOF detect_openmp () { export PKG_CXXFLAGS="" if [ "$(uname)" = "Linux" ]; then - + : ' printf "%s" "* checking if R installation supports OpenMP without any extra hints... " if "${R_HOME}/bin/R" CMD SHLIB test-omp.c >> config.log 2>&1; then echo "yes" @@ -105,6 +105,7 @@ detect_openmp () { else echo "no" fi + ' fi # uname=Linux if [ "$(uname)" = "Darwin" ]; then diff --git a/inst/cc b/inst/cc new file mode 100644 index 00000000..c676937e --- /dev/null +++ b/inst/cc @@ -0,0 +1,2 @@ +CC=clang -arch arm64 +CFLAGS=-falign-functions=64 -Wall -g -O2 diff --git a/src/Makevars b/src/Makevars deleted file mode 100644 index ddf64050..00000000 --- a/src/Makevars +++ /dev/null @@ -1,10 +0,0 @@ -PKG_CPPFLAGS = -I/usr/local/opt/libomp/include -PKG_CXXFLAGS = -Xpreprocessor -fopenmp -#PKG_CFLAGS = -Xclang -fopenmp $(SHLIB_OPENMP_CFLAGS) -DNOZLIB -PKG_LIBS = -lomp $(SHLIB_OPENMP_CFLAGS) -all: $(SHLIB) -# @echo PKG_CFLAGS = $(SHLIB_OPENMP_CFLAGS) -# @echo PKG_LIBS = $(PKG_LIBS) - if [ "$(SHLIB)" != "myTAI$(SHLIB_EXT)" ]; then mv $(SHLIB) myTAI$(SHLIB_EXT); fi - if [ "$(OS)" != "Windows_NT" ] && [ `uname -s` = 'Darwin' ]; then install_name_tool -id myTAI$(SHLIB_EXT) myTAI$(SHLIB_EXT); fi -