Merge pull request #570 from ysangkok/for-upstream

don't pass EMCC specific flags on when configuring using clang

3 files changed, 38 insertions, 4 deletions

diff --git a/AUTHORS b/AUTHORS
index 3a789f36..c78ee543 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -36,3 +36,4 @@ a license to everyone to use it as detailed in LICENSE.)
 * Mokhtar Naamani <mokhtar.naamani@gmail.com>
 * Benjamin Stover <benjamin.stover@gmail.com>
 * Riccardo Magliocchetti <riccardo.magliocchetti@gmail.com>
+* Janus Troelsen <janus.troelsen@stud.tu-darmstadt.de>
diff --git a/emcc b/emcc
index 29e5aa8d..b1c4a8a9 100755
--- a/emcc
+++ b/emcc
@@ -321,6 +321,14 @@ elif len(sys.argv) == 2 and sys.argv[1] == '-v': # -v with no inputs
   print 'emcc (Emscripten GCC-like replacement) 2.0'
   exit(subprocess.call([shared.CLANG, '-v']))
 
+def is_minus_s_for_emcc(newargs,i):
+  assert newargs[i] == '-s'
+  if i+1 < len(newargs) and '=' in newargs[i+1]: # -s OPT=VALUE is for us, -s by itself is a linker option
+    return True
+  else:
+    print >> sys.stderr, 'emcc: warning: treating -s as linker option and not as -s OPT=VALUE for js compilation'
+    return False
+
 # If this is a configure-type thing, do not compile to JavaScript, instead use clang
 # to compile to a native binary (using our headers, so things make sense later)
 CONFIGURE_CONFIG = os.environ.get('EMMAKEN_JUST_CONFIGURE') or 'conftest.c' in sys.argv
@@ -329,7 +337,21 @@ if CONFIGURE_CONFIG or CMAKE_CONFIG:
   compiler = shared.CLANG
   if not ('CXXCompiler' in ' '.join(sys.argv) or os.environ.get('EMMAKEN_CXX')):
     compiler = shared.to_cc(compiler)
-  cmd = [compiler] + shared.EMSDK_OPTS + ['-DEMSCRIPTEN'] + sys.argv[1:]
+  def filter_emscripten_options(argv):
+    idx = 0
+    skip_next = False
+    for el in argv:
+      if skip_next:
+        skip_next = False
+        idx += 1
+        continue
+      if el == '-s' and is_minus_s_for_emcc(argv, idx):
+        skip_next = True
+      else:
+        yield el
+      idx += 1
+    
+  cmd = [compiler] + shared.EMSDK_OPTS + ['-DEMSCRIPTEN'] + list(filter_emscripten_options(sys.argv[1:]))
   if DEBUG: print >> sys.stderr, 'emcc, just configuring: ', ' '.join(cmd)
   exit(subprocess.call(cmd))
 
@@ -553,11 +575,9 @@ try:
   settings_changes = []
   for i in range(len(newargs)):
     if newargs[i] == '-s':
-      if i+1 < len(newargs) and '=' in newargs[i+1]: # -s OPT=VALUE is for us, -s by itself is a linker option
+      if is_minus_s_for_emcc(newargs, i):
         settings_changes.append(newargs[i+1])
         newargs[i] = newargs[i+1] = ''
-      else:
-        print >> sys.stderr, 'emcc: warning: treating -s as linker option and not as -s OPT=VALUE for js compilation'
     elif newargs[i].startswith('--typed-arrays'):
       assert '=' not in newargs[i], 'Invalid typed arrays parameter (do not use "=")'
       settings_changes.append('USE_TYPED_ARRAYS=' + newargs[i+1])
diff --git a/tests/runner.py b/tests/runner.py
index 090ad3f0..baa9eb5e 100755
--- a/tests/runner.py
+++ b/tests/runner.py
@@ -7674,6 +7674,19 @@ fscanfed: 10 - hello
       code = open('a.out.js').read()
       assert 'SAFE_HEAP' in code, 'valid -s option had an effect'
 
+    def test_conftest_s_flag_passing(self):
+      open(os.path.join(self.get_dir(), 'conftest.c'), 'w').write(r'''
+        int main() {
+          return 0;
+        }
+      ''')
+      os.environ["EMMAKEN_JUST_CONFIGURE"] = "1"
+      cmd = ['python', EMCC, '-s', 'ASSERTIONS=1', os.path.join(self.get_dir(), 'conftest.c'), '-o', 'conftest']
+      output = Popen(cmd, stderr=PIPE).communicate()
+      self.assertNotContained('emcc: warning: treating -s as linker option', output[1])
+      assert os.path.exists('conftest')
+      del os.environ["EMMAKEN_JUST_CONFIGURE"]
+
     def test_crunch(self):
       # crunch should not be run if a .crn exists that is more recent than the .dds
       shutil.copyfile(path_from_root('tests', 'ship.dds'), 'ship.dds')