Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Two small tweaks for cross compiling #208

Merged
merged 2 commits into from
Jan 11, 2024
Merged

Two small tweaks for cross compiling #208

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4b3f033
Infer proper arch on MacOS for cross compiling
jeroen Jan 10, 2024
3cba1e2
Support setting link lib only
jeroen Jan 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion R/tbb.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ tbbCxxFlags <- function() {
tbbLdFlags <- function() {

# shortcut if TBB_LIB defined
tbbLib <- Sys.getenv("TBB_LIB", unset = TBB_LIB)
tbbLib <- Sys.getenv("TBB_LINK_LIB", Sys.getenv("TBB_LIB", unset = TBB_LIB))
if (nzchar(tbbLib)) {
fmt <- "-L%1$s -Wl,-rpath,%1$s -ltbb -ltbbmalloc"
return(sprintf(fmt, asBuildPath(tbbLib)))
Expand Down
1 change: 1 addition & 0 deletions src/Makevars.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ else

ifeq ($(UNAME), Darwin)
USE_TBB=Mac
MAKE_ARGS += arch=$(shell uname -m)
endif

ifeq ($(UNAME), Linux)
Expand Down