aboutsummaryrefslogtreecommitdiff
path: root/emcc
diff options
context:
space:
mode:
authorAlon Zakai <alonzakai@gmail.com>2013-06-29 09:27:36 -0700
committerAlon Zakai <alonzakai@gmail.com>2013-07-03 15:31:04 -0700
commit7be8c34546c5c8db548f8b7a5864f7cbd7594ef4 (patch)
tree056cc637ac0707c05e723ee101a6d291a8688b8e /emcc
parentdda4942ef82b68331ed20ed7ce2fb433d396e44c (diff)
do not link in C libraries in side modules
Diffstat (limited to 'emcc')
-rwxr-xr-xemcc4
1 files changed, 3 insertions, 1 deletions
diff --git a/emcc b/emcc
index 304316fc..c5a3d0c1 100755
--- a/emcc
+++ b/emcc
@@ -1151,7 +1151,9 @@ try:
extra_files_to_link = []
if not LEAVE_INPUTS_RAW and not AUTODEBUG and \
- not shared.Settings.BUILD_AS_SHARED_LIB == 2: # shared lib 2 use the library in the parent
+ not shared.Settings.BUILD_AS_SHARED_LIB == 2 and \
+ not shared.Settings.SIDE_MODULE == 2: # shared libraries/side modules link no C libraries, need them in parent
+
# Check if we need to include some libraries that we compile. (We implement libc ourselves in js, but
# compile a malloc implementation and stdlibc++.)