aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDylan Baker <dylan@pnwbakers.com>2020-09-14 14:36:47 -0700
committerDylan Baker <dylan@pnwbakers.com>2020-09-16 20:28:56 -0700
commit4401668c9ac8c42d2e8633e32d168a2c5e1b0ee8 (patch)
tree9b5e2d4acef6431ee78600b6e8a1754d0a0d0e47
parent67ab2880dd976689c9f64f785cec243637e40d30 (diff)
downloadmeson-4401668c9ac8c42d2e8633e32d168a2c5e1b0ee8.zip
meson-4401668c9ac8c42d2e8633e32d168a2c5e1b0ee8.tar.gz
meson-4401668c9ac8c42d2e8633e32d168a2c5e1b0ee8.tar.bz2
linkers/compilers: Move an emscripten method to the compiler
This needed an attribute the linker doesn't have.
-rw-r--r--mesonbuild/compilers/mixins/emscripten.py7
-rw-r--r--mesonbuild/linkers.py7
2 files changed, 7 insertions, 7 deletions
diff --git a/mesonbuild/compilers/mixins/emscripten.py b/mesonbuild/compilers/mixins/emscripten.py
index 10f4b25..08b2205 100644
--- a/mesonbuild/compilers/mixins/emscripten.py
+++ b/mesonbuild/compilers/mixins/emscripten.py
@@ -41,6 +41,13 @@ class EmscriptenMixin:
def thread_flags(self, env: 'Environment') -> T.List[str]:
return ['-s', 'USE_PTHREADS=1']
+ 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
+ if count:
+ args.extend(['-s', 'PTHREAD_POOL_SIZE={}'.format(count)])
+ return args
+
def get_options(self):
opts = super().get_options()
opts.update({
diff --git a/mesonbuild/linkers.py b/mesonbuild/linkers.py
index 54c81b4..fa8b326 100644
--- a/mesonbuild/linkers.py
+++ b/mesonbuild/linkers.py
@@ -780,13 +780,6 @@ class WASMDynamicLinker(GnuLikeDynamicLinkerMixin, PosixDynamicLinkerMixin, Dyna
id = 'ld.wasm'
- 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
- if count:
- args.extend(['-s', 'PTHREAD_POOL_SIZE={}'.format(count)])
- return args
-
def get_allow_undefined_args(self) -> T.List[str]:
return ['-s', 'ERROR_ON_UNDEFINED_SYMBOLS=0']