Commit 059fd10
committed
normalize single-token compiler vars in tbb build
when a Makevars sets e.g. 'CXX=$(CCACHE) g++' with CCACHE empty, the
value expands to ' g++' with a leading space. splitCompilerVar() would
tokenize this to a single token and return early without re-setting the
variable, leaving the leading space in place and forwarding an invalid
'-DCMAKE_CXX_COMPILER= g++' to cmake, breaking the bundled tbb build.
re-set the compiler from the parsed tokens even when there are no
trailing flags; scan() has already stripped surrounding whitespace.1 parent d637cbe commit 059fd10
1 file changed
Lines changed: 5 additions & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
340 | 340 | | |
341 | 341 | | |
342 | 342 | | |
343 | | - | |
| 343 | + | |
344 | 344 | | |
345 | 345 | | |
| 346 | + | |
| 347 | + | |
| 348 | + | |
| 349 | + | |
346 | 350 | | |
347 | 351 | | |
348 | 352 | | |
| |||
0 commit comments