diff options
| author | Kleis Auke Wolthuizen <github@kleisauke.nl> | 2022-10-30 11:43:33 +0100 |
|---|---|---|
| committer | Eli Schwartz <eschwartz93@gmail.com> | 2022-12-27 06:59:55 -0500 |
| commit | 51ac9ed31783f55347e09ae8a80eaebec81e935c (patch) | |
| tree | 22e5bab071823858b16a46d2ee848209c78c4a0e | |
| parent | 898e85d84754536e5f59db770d49b6c057939940 (diff) | |
| download | meson-51ac9ed31783f55347e09ae8a80eaebec81e935c.zip meson-51ac9ed31783f55347e09ae8a80eaebec81e935c.tar.gz meson-51ac9ed31783f55347e09ae8a80eaebec81e935c.tar.bz2 | |
emscripten: use single arguments when specifying options
i.e. without a space between the "-s" and option name. See:
https://github.com/emscripten-core/emscripten/issues/11463
This is supported since Emscripten 1.39.19, see:
https://github.com/emscripten-core/emscripten/commit/f45bea21f3a8f74a68ed4e3e3d7e290807ee2aff
| -rw-r--r-- | cross/wasm.txt | 4 | ||||
| -rw-r--r-- | mesonbuild/compilers/mixins/emscripten.py | 2 | ||||
| -rw-r--r-- | mesonbuild/linkers/linkers.py | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/cross/wasm.txt b/cross/wasm.txt index e03a10b..269c77a 100644 --- a/cross/wasm.txt +++ b/cross/wasm.txt @@ -5,9 +5,9 @@ ar = '/home/jpakkane/src/emsdk/upstream/emscripten/emar' [built-in options] c_args = [] -c_link_args = ['-s','EXPORT_ALL=1'] +c_link_args = ['-sEXPORT_ALL=1'] cpp_args = [] -cpp_link_args = ['-s', 'EXPORT_ALL=1'] +cpp_link_args = ['-sEXPORT_ALL=1'] [host_machine] diff --git a/mesonbuild/compilers/mixins/emscripten.py b/mesonbuild/compilers/mixins/emscripten.py index 3bf192f..44c57ae 100644 --- a/mesonbuild/compilers/mixins/emscripten.py +++ b/mesonbuild/compilers/mixins/emscripten.py @@ -65,7 +65,7 @@ class EmscriptenMixin(Compiler): args = ['-pthread'] count: int = env.coredata.options[OptionKey('thread_count', lang=self.language, machine=self.for_machine)].value if count: - args.extend(['-s', f'PTHREAD_POOL_SIZE={count}']) + args.append(f'-sPTHREAD_POOL_SIZE={count}') return args def get_options(self) -> 'coredata.MutableKeyedOptionDictType': diff --git a/mesonbuild/linkers/linkers.py b/mesonbuild/linkers/linkers.py index 3385dd3..cf2d339 100644 --- a/mesonbuild/linkers/linkers.py +++ b/mesonbuild/linkers/linkers.py @@ -889,10 +889,10 @@ class WASMDynamicLinker(GnuLikeDynamicLinkerMixin, PosixDynamicLinkerMixin, Dyna id = 'ld.wasm' def get_allow_undefined_args(self) -> T.List[str]: - return ['-s', 'ERROR_ON_UNDEFINED_SYMBOLS=0'] + return ['-sERROR_ON_UNDEFINED_SYMBOLS=0'] def no_undefined_args(self) -> T.List[str]: - return ['-s', 'ERROR_ON_UNDEFINED_SYMBOLS=1'] + return ['-sERROR_ON_UNDEFINED_SYMBOLS=1'] def get_soname_args(self, env: 'Environment', prefix: str, shlib_name: str, suffix: str, soversion: str, darwin_versions: T.Tuple[str, str]) -> T.List[str]: |