Merge pull request #207 from jeroen/macos-strict

Fix strict linking on MacOS
RcppCore · Jan 4, 2024 · e5468c0 · e5468c0
2 parents 6f81716 + 6dccebe
commit e5468c0
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/R/platform.R b/R/platform.R
@@ -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"
 }

diff --git a/R/tbb.R b/R/tbb.R
@@ -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)

diff --git a/src/Makevars.in b/src/Makevars.in
@@ -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)')