aboutsummaryrefslogtreecommitdiff
path: root/emcc
diff options
context:
space:
mode:
authorAlon Zakai <alonzakai@gmail.com>2013-04-16 13:48:00 -0700
committerAlon Zakai <alonzakai@gmail.com>2013-04-16 13:48:00 -0700
commit3cbdfcc318e45219edbe78c21cd25fe23f5c1c52 (patch)
tree14717daa5981aab0d79a82ac79d26ebc4c8e9c4a /emcc
parent8435e3f819de4daa2326b84812186543cc5e8b4e (diff)
parent3299393a68844ca5d388808627892a57f92509b1 (diff)
Merge pull request #1038 from juj/fix_test_asm_pgo_windows
Fix test_asm_pgo on Windows.
Diffstat (limited to 'emcc')
-rwxr-xr-xemcc14
1 files changed, 3 insertions, 11 deletions
diff --git a/emcc b/emcc
index 6c7ed2f5..7edc71e4 100755
--- a/emcc
+++ b/emcc
@@ -79,6 +79,7 @@ import os, sys, shutil, tempfile, subprocess, shlex, time, re
from subprocess import PIPE, STDOUT
from tools import shared
from tools.shared import Compression, execute, suffix, unsuffixed, unsuffixed_basename
+from tools.response_file import read_response_file
# Mapping of emcc opt levels to llvm opt levels. We use llvm opt level 3 in emcc opt
# levels 2 and 3 (emcc 3 is unsafe opts, so unsuitable for the only level to get
@@ -129,19 +130,10 @@ while response_file:
for index in range(1, len(sys.argv)):
if sys.argv[index][0] == '@':
# found one, loop again next time
- response_file = sys.argv[index][1:]
- print >>sys.stderr, 'emcc: using response file: %s' % response_file
- if not os.path.exists(response_file):
- print >>sys.stderr, 'emcc: error: Response file not found: %s' % response_file
- exit(1)
-
- response_fd = open(response_file, 'r')
- extra_args = shlex.split(response_fd.read())
- response_fd.close()
-
+ response_file = True
+ extra_args = read_response_file(sys.argv[index])
# slice in extra_args in place of the response file arg
sys.argv[index:index+1] = extra_args
- #if DEBUG: print >>sys.stderr, "Expanded response file: " + " | ".join(sys.argv)
break
if sys.argv[1] == '--version':