aboutsummaryrefslogtreecommitdiff
path: root/emcc
diff options
context:
space:
mode:
authorAlon Zakai <alonzakai@gmail.com>2013-07-30 15:53:47 -0700
committerAlon Zakai <alonzakai@gmail.com>2013-07-30 15:53:47 -0700
commit55626711df57e3f675935fb816022da242d023a6 (patch)
tree376d4c5a4ed180e259f139de7269c1e57274eff7 /emcc
parent7d395b63624edb19717affac24345c8ccd69e355 (diff)
disable asm in embind mode, and add a test for what embind cannot do in asm mode yet; issue #1447
Diffstat (limited to 'emcc')
-rwxr-xr-xemcc4
1 files changed, 4 insertions, 0 deletions
diff --git a/emcc b/emcc
index 91b109b6..46dca960 100755
--- a/emcc
+++ b/emcc
@@ -1030,6 +1030,10 @@ try:
exec('shared.Settings.' + key + ' = ' + value)
# Apply effects from settings
+ if bind and shared.Settings.ASM_JS:
+ logging.warning('disabling asm.js since embind is not ready for it yet')
+ shared.Settings.ASM_JS = 0
+
if shared.Settings.ASM_JS:
assert opt_level >= 1, 'asm.js requires -O1 or above'