aboutsummaryrefslogtreecommitdiff
path: root/emcc
diff options
context:
space:
mode:
authorAlon Zakai <alonzakai@gmail.com>2012-06-22 20:28:03 -0700
committerAlon Zakai <alonzakai@gmail.com>2012-06-22 20:28:03 -0700
commit956c99725500bd10036fce909fb7aaf8b3480e12 (patch)
treec5b5b53915bd703b994af074bf280296e24f387f /emcc
parentddd0442f97226dee5b16f6c860366ba415228267 (diff)
enable previous assertion, properly
Diffstat (limited to 'emcc')
-rwxr-xr-xemcc4
1 files changed, 3 insertions, 1 deletions
diff --git a/emcc b/emcc
index e9be3e9e..9b1090ba 100755
--- a/emcc
+++ b/emcc
@@ -575,6 +575,8 @@ try:
libs.append(arg[2:])
newargs[i] = ''
+ original_input_files = input_files
+
newargs = [ arg for arg in newargs if arg is not '' ]
# Find library files
@@ -681,7 +683,7 @@ try:
if len(input_files) == 1:
shutil.move(in_temp(unsuffixed_uniquename(input_files[0]) + '.o'), specified_target)
else:
- #assert not has_dash_c, 'fatal error: cannot specify -o with -c with multiple files' + str(sys.argv) + ':' + str(input_files)
+ assert len(original_input_files) == 1 or not has_dash_c, 'fatal error: cannot specify -o with -c with multiple files' + str(sys.argv) + ':' + str(original_input_files)
# We have a specified target (-o <target>), which is not JavaScript or HTML, and
# we have multiple files: Link them
if DEBUG: print >> sys.stderr, 'emcc: link: ' + str(temp_files)