From 0841d1710e40fe498ea12142a61230c8f707c7e9 Mon Sep 17 00:00:00 2001 From: Andrei Alexeyev Date: Tue, 15 Oct 2019 01:10:17 +0300 Subject: emscripten: fix false positives in linking tests --- mesonbuild/compilers/mixins/emscripten.py | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'mesonbuild') diff --git a/mesonbuild/compilers/mixins/emscripten.py b/mesonbuild/compilers/mixins/emscripten.py index 742d528..4797cbc 100644 --- a/mesonbuild/compilers/mixins/emscripten.py +++ b/mesonbuild/compilers/mixins/emscripten.py @@ -31,3 +31,16 @@ class EmscriptenMixin: def get_linker_output_args(self, output: str) -> typing.List[str]: return ['-o', output] + + def _get_compile_output(self, dirname, mode): + # In pre-processor mode, the output is sent to stdout and discarded + if mode == 'preprocess': + return None + # Unlike sane toolchains, emcc infers the kind of output from its name. + # This is the only reason why this method is overriden; compiler tests + # do not work well with the default exe/obj suffices. + if mode == 'link': + suffix = 'js' + else: + suffix = 'wasm' + return os.path.join(dirname, 'output.' + suffix) -- cgit v1.1