Merge remote-tracking branch 'upstream/incoming' into fast-cwrap

1 files changed, 2 insertions, 0 deletions

diff --git a/emcc b/emcc
index 1629f5c7..2dc525af 100755
--- a/emcc
+++ b/emcc
@@ -1223,6 +1223,8 @@ try:
       value = '"@' + os.path.abspath(value[1:]) + '"'
       value = value.replace('\\\\', '/').replace('\\', '/') # Convert backslash paths to forward slashes on Windows as well, since the JS compiler otherwise needs the backslashes escaped (alternative is to escape all input paths passing to JS, which feels clumsier to read)
     exec('shared.Settings.' + key + ' = ' + value)
+    if key == 'EXPORTED_FUNCTIONS':
+      shared.Settings.ORIGINAL_EXPORTED_FUNCTIONS = shared.Settings.EXPORTED_FUNCTIONS[:] # used for warnings in emscripten.py
 
   fastcomp = os.environ.get('EMCC_FAST_COMPILER') != '0'