forked from Rdatatable/data.table
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
This detects support for OpenMP and only includes the compiler flags for it if OpenMP is supported. This solves the common case on macOS, because R on macOS ships with `-fopenmp` in SHLIB_OPENMP_CFLAGS, as the CRAN compiler toolchain _does_ support OpenMP, however the XCode toolchain distributed by Apple _does not_ support OpenMP, which causes data.table to fail to compile from source. Fixes Rdatatable#2161
- Loading branch information
Showing
7 changed files
with
33 additions
and
6 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -15,6 +15,7 @@ | |
^NEWS\.0\.md$ | ||
^README\.md$ | ||
^_pkgdown\.yml$ | ||
^src/Makevars$ | ||
|
||
^\.RData$ | ||
^\.Rhistory$ | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -9,6 +9,7 @@ Rplots.pdf | |
*-Ex.R | ||
data.table_*.tar.gz | ||
data.table.Rcheck | ||
src/Makevars | ||
|
||
# Emacs IDE files | ||
.emacs.desktop | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
#!/bin/sh | ||
rm -f src/Makevars |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,9 +1,6 @@ | ||
|
||
PKG_CFLAGS = $(SHLIB_OPENMP_CFLAGS) | ||
PKG_LIBS = $(SHLIB_OPENMP_CFLAGS) -lz | ||
PKG_CFLAGS = @openmp_cflags@ | ||
PKG_LIBS = @openmp_cflags@ -lz | ||
|
||
all: $(SHLIB) | ||
mv $(SHLIB) datatable$(SHLIB_EXT) | ||
if [ "$(OS)" != "Windows_NT" ] && [ `uname -s` = 'Darwin' ]; then install_name_tool -id datatable$(SHLIB_EXT) datatable$(SHLIB_EXT); fi | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
PKG_CFLAGS = $(SHLIB_OPENMP_CFLAGS) | ||
PKG_LIBS = $(SHLIB_OPENMP_CFLAGS) -lz | ||
|
||
all: $(SHLIB) | ||
mv $(SHLIB) datatable$(SHLIB_EXT) |