aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Claughton <dave@eclecticdave.com>2012-11-30 00:07:34 +0000
committerDavid Claughton <dave@eclecticdave.com>2012-11-30 21:56:00 +0000
commit5d48629cf051b2b60948953190ecb96ce8c1dcbc (patch)
tree583d7ac23e42a89ae9ec52640b9457daf9a1f96b
parent98d730f930f1054afa1dee358a203e2378e5afef (diff)
Fixes to emcc to make autoconf enable shared objs
When using emcc as a linker, autoconf disables shared object support. This is because it expects the text returned by the -v and --help options to match certain things that GNU ld prints. Specifically it expects the output of emcc -v to include the word 'GNU' and the output of emcc -v to match the regexp ': supported targets.* elf' Modified the messages returned by emcc for these options to make autoconf happy.
-rwxr-xr-xemcc4
1 files changed, 3 insertions, 1 deletions
diff --git a/emcc b/emcc
index dc8bd630..0bf4fd1f 100755
--- a/emcc
+++ b/emcc
@@ -374,10 +374,12 @@ or LLVM assembly files in human-readable form.
emcc is affected by several environment variables. For details, view
the source of emcc (search for 'os.environ').
+emcc: supported targets: llvm bitcode, javascript, NOT elf
+(autoconf likes to see elf above to enable shared object support)
''' % (this, this, this)
exit(0)
elif len(sys.argv) == 2 and sys.argv[1] == '-v': # -v with no inputs
- print 'emcc (Emscripten GCC-like replacement) 2.0'
+ print 'emcc (Emscripten GCC-like replacement + linker emulating GNU ld ) 2.0'
exit(subprocess.call([shared.CLANG, '-v']))
def is_minus_s_for_emcc(newargs,i):