aboutsummaryrefslogtreecommitdiff
path: root/emcc
diff options
context:
space:
mode:
authorAlon Zakai <alonzakai@gmail.com>2012-05-02 21:14:14 -0700
committerAlon Zakai <alonzakai@gmail.com>2012-05-02 21:53:08 -0700
commitf60dc11a02405e09b66340001f327ef799f59f47 (patch)
tree0d2a59798bf76fad1252ba78a115af0e2c8db27d /emcc
parent9d1c43e2c55501f6b143edca6f9e9d3dfbc91a7d (diff)
link files in emcc without leaving a stub
Diffstat (limited to 'emcc')
-rwxr-xr-xemcc8
1 files changed, 3 insertions, 5 deletions
diff --git a/emcc b/emcc
index c2636438..46efe0da 100755
--- a/emcc
+++ b/emcc
@@ -708,11 +708,9 @@ try:
else:
assert not has_dash_c, 'fatal error: cannot specify -o with -c with multiple files' + str(sys.argv)
# We have a specified target (-o <target>), which is not JavaScript or HTML, and
- # we have multiple files: Link them TODO: llvm link-time opts?
- ld_args = temp_files + ['-b', specified_target]
- #[arg.split('-Wl,')[1] for arg in filter(lambda arg: arg.startswith('-Wl,'), sys.argv)]
- if DEBUG: print >> sys.stderr, 'emcc: link: ' + str(ld_args)
- execute([shared.LLVM_LD, '-disable-opt'] + ld_args)
+ # we have multiple files: Link them
+ if DEBUG: print >> sys.stderr, 'emcc: link: ' + str(temp_files)
+ shared.Building.link(temp_files, specified_target)
exit(0)
## Continue on to create JavaScript