aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlon Zakai <alonzakai@gmail.com>2013-07-03 16:57:44 -0700
committerAlon Zakai <alonzakai@gmail.com>2013-07-03 16:57:44 -0700
commit6ad418da827d09b84f2e542908302cebaa7c272c (patch)
tree20271bfdc8ad4e85e9ba05698920731c24cedbde
parent0903bbc29c08035e873690a6c047a593798a366a (diff)
force-include .a contents of multiple archives when they are the only inputs aside from linked libraries
-rwxr-xr-xemcc2
1 files changed, 1 insertions, 1 deletions
diff --git a/emcc b/emcc
index 4f2f427d..90a2ea71 100755
--- a/emcc
+++ b/emcc
@@ -1413,7 +1413,7 @@ try:
linker_inputs = temp_files + extra_files_to_link
logging.debug('linking: ' + str(linker_inputs))
t0 = time.time()
- shared.Building.link(linker_inputs, in_temp(target_basename + '.bc'), force_archive_contents = len(input_files) == 1 and temp_files[0].endswith(STATICLIB_SUFFIXES))
+ shared.Building.link(linker_inputs, in_temp(target_basename + '.bc'), force_archive_contents = len(filter(lambda temp: not temp.endswith(STATICLIB_SUFFIXES), temp_files)) == 0)
t1 = time.time()
logging.debug(' linking took %.2f seconds' % (t1 - t0))
final = in_temp(target_basename + '.bc')