Commit c3d0825
authored
clean stale tbb build artifacts before shipping libraries (#255)
Long-lived working trees can carry TBB libraries in
src/tbb/build/lib_release from prior builds -- including from the
pre-6.0 make-based build system, whose Windows DLLs (tbb.dll,
tbbmalloc.dll, tbbmalloc_proxy.dll) could be swept into the installed
package and mask the tbb stub library.
- clear lib_release before repopulating it in useBundledTbb(), so
installs ship exactly what the current build produced
- enable the (previously commented-out) removal of src/tbb/build in
cleanup.R; since the cmake migration, the bundled TBB is rebuilt from
scratch on every install, so these artifacts are not reused anyway1 parent 6e20b49 commit c3d0825
2 files changed
Lines changed: 9 additions & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
236 | 236 | | |
237 | 237 | | |
238 | 238 | | |
| 239 | + | |
| 240 | + | |
| 241 | + | |
| 242 | + | |
239 | 243 | | |
240 | 244 | | |
241 | 245 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
2 | 2 | | |
3 | 3 | | |
4 | 4 | | |
5 | | - | |
6 | | - | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
7 | 10 | | |
8 | 11 | | |
9 | 12 | | |
| |||
0 commit comments