Skip to content

Fix strict linking on MacOS #207

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

Merged
merged 2 commits into from
Jan 4, 2024
Merged

Fix strict linking on MacOS #207

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
5b167bf
Fix strict linking on MacOS
jeroen Jan 3, 2024
6dccebe
Set correct rpath in shared library.
jeroen Jan 3, 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
4 changes: 4 additions & 0 deletions R/platform.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@ is_windows <- function() {
.Platform$OS.type == "windows"
}

is_mac <- function() {
Sys.info()[["sysname"]] == "Darwin"
}

is_unix <- function() {
.Platform$OS.type == "unix"
}
Expand Down
4 changes: 2 additions & 2 deletions R/tbb.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,8 +81,8 @@ tbbLdFlags <- function() {
return(sprintf(fmt, asBuildPath(tbbLib)))
}

# on Windows and Solaris, we need to explicitly link
needsExplicitFlags <- is_windows() || (is_solaris() && !is_sparc())
# on Mac, Windows and Solaris, we need to explicitly link (#206)
needsExplicitFlags <- is_mac() || is_windows() || (is_solaris() && !is_sparc())
if (needsExplicitFlags) {
libPath <- asBuildPath(tbbLibraryPath())
libFlag <- paste0("-L", libPath)
Expand Down
5 changes: 5 additions & 0 deletions src/Makevars.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,11 @@ ifneq (@COMPILER@, )
MAKE_ARGS += compiler=@COMPILER@
endif

# When TBB_LIB is unset on MacOS, link to the bundled version (#206)
ifeq ($(USE_TBB)$(TBB_LIB),Mac)
PKG_LIBS += -Ltbb/build/lib_release -ltbb -Wl,-rpath,'@loader_path/../lib'
endif

# For Solaris detect if this is 32-bit R on x86 and if so forward that to TBB
ifeq ($(USE_TBB), SunOS)
R_32BIT = $(shell ${R_HOME}/bin/Rscript -e 'cat(.Machine$$sizeof.pointer == 4)')
Expand Down