Commit 5639320
authored
Fix default setting of EXECUTABLE overriding the value set in phase_linker_setup() for autoconfiguring. (#26822)
Fix default setting of EXECUTABLE overriding the value set in
phase_linker_setup() for autoconfiguring.
This line has no effect:
https://github.com/emscripten-core/emscripten/blob/2a8234f6651fcc2fdfaf1a97e749720ea76d55a7/tools/link.py#L829-L830
since it was being overridden by `default_setting('EXECUTABLE', 1)`,
which looks only in `user_settings`, and not if the setting has already
been initialized.
The result is that all autoconfigures would get the default shebang
https://github.com/emscripten-core/emscripten/blob/2a8234f6651fcc2fdfaf1a97e749720ea76d55a7/tools/link.py#L460-L462
and attempt to run Node from PATH.
On my CI, I don't have a Node in PATH (exactly for the purposes of
guarding against accidental 'wrong node' accesses like this). Fixes
`test_bullet_autoconf` without Node in PATH:
http://clbri.com:8010/api/v2/logs/406907/raw_inline1 parent 0d980eb commit 5639320
1 file changed
Lines changed: 4 additions & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
933 | 933 | | |
934 | 934 | | |
935 | 935 | | |
936 | | - | |
| 936 | + | |
| 937 | + | |
| 938 | + | |
| 939 | + | |
937 | 940 | | |
938 | 941 | | |
939 | 942 | | |
| |||
0 commit comments