aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlon Zakai <alonzakai@gmail.com>2014-02-08 20:31:56 -0800
committerAlon Zakai <alonzakai@gmail.com>2014-02-08 20:31:56 -0800
commitb3ab733682b4e909b5f52f8d9c4964332abd4817 (patch)
tree9f6fff798beca697c76154239a63b067f1e7731b
parent2ab9b016dcb2df413a62e10c3297ea195c7530d1 (diff)
system libs fixes
-rwxr-xr-xemcc2
-rw-r--r--tools/system_libs.py3
2 files changed, 3 insertions, 2 deletions
diff --git a/emcc b/emcc
index a77e2c4f..1d8bdb7c 100755
--- a/emcc
+++ b/emcc
@@ -1411,7 +1411,7 @@ try:
if not LEAVE_INPUTS_RAW and \
not shared.Settings.BUILD_AS_SHARED_LIB and \
not shared.Settings.SIDE_MODULE: # shared libraries/side modules link no C libraries, need them in parent
- extra_files_to_link = system_libs.calculate(temp_files)
+ extra_files_to_link = system_libs.calculate(temp_files, in_temp, stdout, stderr)
else:
extra_files_to_link = []
diff --git a/tools/system_libs.py b/tools/system_libs.py
index 42c9d67c..28a62f89 100644
--- a/tools/system_libs.py
+++ b/tools/system_libs.py
@@ -1,7 +1,8 @@
import os, json, logging
import shared
+from tools.shared import execute
-def calculate(temp_files):
+def calculate(temp_files, in_temp, stdout, stderr):
# Check if we need to include some libraries that we compile. (We implement libc ourselves in js, but
# compile a malloc implementation and stdlibc++.)