Commit 0e0e0c1
committed
link downstream packages against the tbb stub on windows
tbbLdFlags() returned only '-L<libs> -lRcppParallel' on Windows, leaving
downstream packages to resolve TBB symbols against whichever objects
happened to be pulled out of the static TBB when RcppParallel.dll was
linked. That export surface is incidental rather than declared, and
packages taking all of their PKG_LIBS from RcppParallelLibs() (e.g. rstan)
have no other way to ask for TBB.
Offer the stub library as well, after '-lRcppParallel' so the package's own
exports still take precedence and no dependency on the stub is recorded
unless something actually needs it. RcppParallel 5.1.11 and earlier appended
'-ltbb -ltbbmalloc' here for the same reason.1 parent a3c7cd7 commit 0e0e0c1
1 file changed
Lines changed: 15 additions & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
87 | 87 | | |
88 | 88 | | |
89 | 89 | | |
90 | | - | |
| 90 | + | |
91 | 91 | | |
92 | 92 | | |
93 | 93 | | |
| 94 | + | |
| 95 | + | |
| 96 | + | |
| 97 | + | |
| 98 | + | |
| 99 | + | |
| 100 | + | |
| 101 | + | |
| 102 | + | |
| 103 | + | |
| 104 | + | |
| 105 | + | |
| 106 | + | |
94 | 107 | | |
95 | | - | |
| 108 | + | |
96 | 109 | | |
97 | 110 | | |
98 | 111 | | |
| |||
0 commit comments