Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit 544498f

Browse filesBrowse files
authored
Merge pull request #223 from kalibera/no-rpath-on-windows
Do not attempt to use -rpath on Windows when linking.
2 parents 8c000aa + 4771acf commit 544498f
Copy full SHA for 544498f

File tree

2 files changed

+7
-2
lines changed
Filter options

2 files changed

+7
-2
lines changed

‎R/tbb.R

Copy file name to clipboardExpand all lines: R/tbb.R
+2-1Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,8 @@ tbbLdFlags <- function() {
8383
# shortcut if TBB_LIB defined
8484
tbbLib <- Sys.getenv("TBB_LINK_LIB", Sys.getenv("TBB_LIB", unset = TBB_LIB))
8585
if (nzchar(tbbLib)) {
86-
fmt <- "-L%1$s -Wl,-rpath,%1$s -ltbb -ltbbmalloc"
86+
fmt <- if (is_windows()) "-L%1$s -ltbb -ltbbmalloc"
87+
else "-L%1$s -Wl,-rpath,%1$s -ltbb -ltbbmalloc"
8788
return(sprintf(fmt, asBuildPath(tbbLib)))
8889
}
8990

‎src/Makevars.in

Copy file name to clipboardExpand all lines: src/Makevars.in
+5-1Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,11 @@ endif
1313

1414
# If TBB_LIB is defined, link to that explicitly.
1515
ifdef TBB_LIB
16-
PKG_LIBS = -Wl,-L"$(TBB_LIB)" -Wl,-rpath,"$(TBB_LIB)" -ltbb -ltbbmalloc
16+
ifeq ($(OS), Windows_NT)
17+
PKG_LIBS = -Wl,-L"$(TBB_LIB)" -ltbb -ltbbmalloc
18+
else
19+
PKG_LIBS = -Wl,-L"$(TBB_LIB)" -Wl,-rpath,"$(TBB_LIB)" -ltbb -ltbbmalloc
20+
endif
1721
endif
1822

1923
ifeq ($(OS), Windows_NT)

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.