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

provide some backwards compatibility with existing binaries #233

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 7 commits into from
Jan 18, 2025
Merged

provide some backwards compatibility with existing binaries #233

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
8c929d3
first steps at backwards compat
kevinushey Jan 17, 2025
a6e97f4
more exports for linux
kevinushey Jan 17, 2025
dad89c9
include stub library on Windows
kevinushey Jan 18, 2025
29dcdb5
tweaks
kevinushey Jan 18, 2025
b77ae67
dll export
kevinushey Jan 18, 2025
38d96b6
clean up when we're done
kevinushey Jan 18, 2025
ee6d640
overwrite
kevinushey Jan 18, 2025
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
Prev Previous commit
Next Next commit
tweaks
  • Loading branch information
@kevinushey
kevinushey committed Jan 18, 2025
commit 29dcdb52e8999c5b00b9636552c4434d7ed46e28
4 changes: 2 additions & 2 deletions 4 src/install.libs.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@
writeLines("** creating tbb stub library")
status <- system("R CMD SHLIB tbb-compat/tbb-compat.cpp")
if (status != 0)
stop("error build tbb stub library")
stop("error building tbb stub library")
file.rename("tbb-compat/tbb-compat.dll", file.path(tbbDest, "tbb.dll"))
}
}
Expand All @@ -94,7 +94,7 @@ useTbbPreamble <- function(tbbInc) {
}

useSystemTbb <- function(tbbLib, tbbInc) {
writeLines("** using system-provided tbb installation")
useTbbPreamble(tbbInc)
}

useBundledTbb <- function() {
Expand Down
6 changes: 3 additions & 3 deletions 6 tools/config/configure.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -316,12 +316,12 @@ if (.Platform$OS.type == "windows" && is.na(tbbLib)) {
define(PKG_CXXFLAGS = "-DRCPP_PARALLEL_USE_TBB=0")
} else {
define(TBB_ENABLED = TRUE)
define(PKG_CXXFLAGS = "-DRCPP_PARALLEL_USE_TBB=1 -DRCPP_PARALLEL_TBB_COMPAT=1")
define(PKG_CXXFLAGS = "-DRCPP_PARALLEL_USE_TBB=1")
}

# macOS needs some extra flags set
if (Sys.info()[["sysname"]] == "Darwin") {
define(PKG_LIBS_EXTRA = "-Wl,-rpath,\"@loader_path/../lib\"")
define(PKG_LIBS_EXTRA = "-Wl,-rpath,@loader_path/../lib")
} else {
define(PKG_LIBS_EXTRA = "")
}
}
Loading
Morty Proxy This is a proxified and sanitized view of the page, visit original site.