summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlon Zakai <alonzakai@gmail.com>2012-04-14 20:55:27 -0700
committerAlon Zakai <alonzakai@gmail.com>2012-04-14 20:55:27 -0700
commit77b4b4a0c096e97114cfc027397cd2d3f3e1f983 (patch)
treed262a6fe7034c9b96d1f12b604111a37f48ad8af
parent953323e80a9765fc3d7d7bfd3134d1a4a9c48580 (diff)
parentb54f698e3fda6aee49ffc4398b501199055defa6 (diff)
Merge pull request #387 from SiggyBar/windows-5
One more linker stub fix for Windows.
-rw-r--r--tools/shared.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/shared.py b/tools/shared.py
index 3f0d89ec..6f168a36 100644
--- a/tools/shared.py
+++ b/tools/shared.py
@@ -499,7 +499,7 @@ set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY)''' % { 'winfix': '' if not WINDOWS e
@staticmethod
def link(files, target):
try_delete(target)
- stub = os.path.join(EMSCRIPTEN_TEMP_DIR, 'stub_deleteme')
+ stub = os.path.join(EMSCRIPTEN_TEMP_DIR, 'stub_deleteme') + ('.exe' if WINDOWS else '')
output = Popen([LLVM_LD, '-disable-opt'] + files + ['-b', target, '-o', stub], stdout=PIPE).communicate()[0]
try_delete(stub) # clean up stub left by the linker
assert os.path.exists(target) and (output is None or 'Could not open input file' not in output), 'Linking error: ' + output