diff options
| -rwxr-xr-x | tests/runner.py | 4 | ||||
| -rw-r--r-- | tools/shared.py | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/tests/runner.py b/tests/runner.py index b4c49271..2a0307e9 100755 --- a/tests/runner.py +++ b/tests/runner.py @@ -3970,7 +3970,7 @@ def process(filename): if self.emcc_args is None: if Building.LLVM_OPTS: return self.skip('optimizing bitcode before emcc can confuse libcxx inclusion') self.emcc_args = [] # libc++ auto-inclusion is only done if we use emcc - if self.emcc_args is None: Settings.SAFE_HEAP = 0 # Some spurious warnings from libc++ internals + Settings.SAFE_HEAP = 0 # Some spurious warnings from libc++ internals src = ''' #include <iostream> @@ -4363,7 +4363,7 @@ def process(filename): # Combine libraries - combined = os.path.join(self.get_build_dir(), 'combined.bc') + combined = os.path.join(self.get_dir(), 'poppler-combined.bc') Building.link([freetype, poppler], combined) self.do_ll_run(combined, diff --git a/tools/shared.py b/tools/shared.py index d1fbf878..366834ef 100644 --- a/tools/shared.py +++ b/tools/shared.py @@ -426,6 +426,7 @@ class Building: @staticmethod def link(files, target): + try_delete(target) output = Popen([LLVM_LINK] + files + ['-o', target], stdout=PIPE).communicate()[0] assert os.path.exists(target) and (output is None or 'Could not open input file' not in output), 'Linking error: ' + output |