Commit 6e20b49
authored
use configure-detected TBB_LIB during install.libs (#254)
At the install-libs phase, TBB_LIB was read only from the environment,
which is typically unset there -- configure communicates it via make
variables, not the environment. On Windows, where configure detects the
Rtools copy of TBB, this meant .install.libs() wrongly took the
bundled-TBB branch, shipping any stale artifacts present in
tbb/build/lib_release (e.g. TBB DLLs built by RcppParallel 5.x in a
long-lived working tree, masking the tbb stub library). On Linux and
macOS, system-TBB builds silently shipped no libraries at all.
Fall back to the configure-detected value from tbb-autodetected.R when
the environment variable is unset.1 parent a269874 commit 6e20b49
1 file changed
Lines changed: 9 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
319 | 319 | | |
320 | 320 | | |
321 | 321 | | |
| 322 | + | |
| 323 | + | |
| 324 | + | |
| 325 | + | |
| 326 | + | |
322 | 327 | | |
| 328 | + | |
| 329 | + | |
| 330 | + | |
323 | 331 | | |
| 332 | + | |
324 | 333 | | |
0 commit comments