aboutsummaryrefslogtreecommitdiff
path: root/emcc
diff options
context:
space:
mode:
authorAlon Zakai <alonzakai@gmail.com>2013-06-24 18:44:51 -0700
committerAlon Zakai <alonzakai@gmail.com>2013-07-03 15:31:03 -0700
commit74e60024e3724cfd2ffac2ea574e1051d6381d6b (patch)
treedd39e9121957195721533883a32e6b23032c02c9 /emcc
parentaf60ede0bced44dbfa6f011d8c9a5491265ae42a (diff)
cleanups
Diffstat (limited to 'emcc')
-rwxr-xr-xemcc7
1 files changed, 4 insertions, 3 deletions
diff --git a/emcc b/emcc
index c6b0893b..600a99fd 100755
--- a/emcc
+++ b/emcc
@@ -1069,11 +1069,12 @@ try:
if shared.Settings.MAIN_MODULE:
assert not shared.Settings.SIDE_MODULE
shared.Settings.INCLUDE_FULL_LIBRARY = 1
- shared.Settings.LINKABLE = 1 # TODO: add FORCE_DCE option for the brave people that do want to dce here and in side modules
- debug_level = max(debug_level, 2) # preserve function names
elif shared.Settings.SIDE_MODULE:
assert not shared.Settings.MAIN_MODULE
- shared.Settings.LINKABLE = 1
+
+ if shared.Settings.MAIN_MODULE or shared.Settings.SIDE_MODULE:
+ assert not memory_init_file, 'memory init file is not supported with module linking'
+ shared.Settings.LINKABLE = 1 # TODO: add FORCE_DCE option for the brave people that do want to dce here and in side modules
debug_level = max(debug_level, 2)
## Compile source code to bitcode