Skip to content

Commit

Permalink
reduce -s linker warning to debug
Browse files Browse the repository at this point in the history
  • Loading branch information
kripken committed Oct 19, 2015
1 parent 12706b0 commit 56c5055
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 2 deletions.
2 changes: 1 addition & 1 deletion emcc
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ def is_minus_s_for_emcc(newargs, i):
if i+1 < len(newargs) and '=' in newargs[i+1] and not newargs[i+1].startswith('-'): # -s OPT=VALUE is for us, -s by itself is a linker option
return True
else:
logging.warning('treating -s as linker option and not as -s OPT=VALUE for js compilation')
logging.debug('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
Expand Down
1 change: 0 additions & 1 deletion tests/test_other.py
Original file line number Diff line number Diff line change
Expand Up @@ -2073,7 +2073,6 @@ def test_link_s(self):
Popen([PYTHON, EMCC, os.path.join(self.get_dir(), 'supp.cpp'), '-o', 'supp.o']).communicate()

output = Popen([PYTHON, EMCC, os.path.join(self.get_dir(), 'main.o'), '-s', os.path.join(self.get_dir(), 'supp.o'), '-s', 'SAFE_HEAP=1'], stderr=PIPE).communicate()
self.assertContained('treating -s as linker option', output[1])
output = run_js('a.out.js')
assert 'yello' in output, 'code works'
code = open('a.out.js').read()
Expand Down

0 comments on commit 56c5055

Please sign in to comment.