From bbe19d25075dc5fcd5d9cb6a0f913c9b9549c8d8 Mon Sep 17 00:00:00 2001 From: Jussi Pakkanen Date: Mon, 9 Nov 2020 19:08:48 +0200 Subject: Fix WASM thread count option. Closes #7921. --- mesonbuild/compilers/mixins/emscripten.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mesonbuild/compilers/mixins/emscripten.py b/mesonbuild/compilers/mixins/emscripten.py index 87bc40c87..cd18b35a5 100644 --- a/mesonbuild/compilers/mixins/emscripten.py +++ b/mesonbuild/compilers/mixins/emscripten.py @@ -50,7 +50,7 @@ class EmscriptenMixin(Compiler): def thread_link_flags(self, env: 'Environment') -> T.List[str]: args = ['-s', 'USE_PTHREADS=1'] - count = env.coredata.compiler_options[self.for_machine]['{}_thread_count'.format(self.language)].value # type: int + count = env.coredata.compiler_options[self.for_machine][self.language]['thread_count'].value # type: int if count: args.extend(['-s', 'PTHREAD_POOL_SIZE={}'.format(count)]) return args @@ -58,7 +58,7 @@ class EmscriptenMixin(Compiler): def get_options(self) -> 'coredata.OptionDictType': opts = super().get_options() opts.update({ - '{}_thread_count'.format(self.language): coredata.UserIntegerOption( + 'thread_count': coredata.UserIntegerOption( 'Number of threads to use in web assembly, set to 0 to disable', (0, None, 4), # Default was picked at random ), -- cgit v1.2.1