diff options
| author | Alon Zakai <alonzakai@gmail.com> | 2011-12-14 16:16:59 -0800 |
|---|---|---|
| committer | Alon Zakai <alonzakai@gmail.com> | 2011-12-14 16:16:59 -0800 |
| commit | 8e7d56453f584c3be3b1aca0f642a94278afc466 (patch) | |
| tree | 448ef0ac60686ba6621b253d3f16b03cf247a401 /tools | |
| parent | ad34dff9ae485eafab64d68a61a193f82f3b1988 (diff) | |
initial prep for emcc by default
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/emconfiguren.py | 2 | ||||
| -rwxr-xr-x | tools/emmaken.py | 2 | ||||
| -rw-r--r-- | tools/shared.py | 10 |
3 files changed, 13 insertions, 1 deletions
diff --git a/tools/emconfiguren.py b/tools/emconfiguren.py index abe41564..d549908b 100755 --- a/tools/emconfiguren.py +++ b/tools/emconfiguren.py @@ -1,5 +1,7 @@ #!/usr/bin/env python +raise Exception('emconfiguren is deprecated!') + ''' This is a helper script for emmaken.py. See docs in that file for more info. ''' diff --git a/tools/emmaken.py b/tools/emmaken.py index a509b940..89785bc5 100755 --- a/tools/emmaken.py +++ b/tools/emmaken.py @@ -1,5 +1,7 @@ #!/usr/bin/env python +raise Exception('emmaken is deprecated!') + ''' emmaken - the emscripten make proxy tool ======================================== diff --git a/tools/shared.py b/tools/shared.py index b61552ba..1865a026 100644 --- a/tools/shared.py +++ b/tools/shared.py @@ -28,6 +28,10 @@ DEMANGLER = path_from_root('third_party', 'demangler.py') NAMESPACER = path_from_root('tools', 'namespacer.py') EMCC = path_from_root('emcc') EMXX = path_from_root('em++') +EMAR = path_from_root('emar') +EMLD = path_from_root('emld') +EMRANLIB = path_from_root('emranlib') +EMLIBTOOL = path_from_root('emlibtool') EMMAKEN = path_from_root('tools', 'emmaken.py') AUTODEBUGGER = path_from_root('tools', 'autodebugger.py') DFE = path_from_root('tools', 'dead_function_eliminator.py') @@ -217,7 +221,11 @@ class Building: @staticmethod def get_building_env(): env = os.environ.copy() - env['RANLIB'] = env['AR'] = env['CXX'] = env['CC'] = env['LIBTOOL'] = EMMAKEN + env['CC'] = EMCC + env['CXX'] = EMXX + env['AR'] = EMAR + env['RANLIB'] = EMRANLIB + env['LIBTOOL'] = EMLIBTOOL env['EMMAKEN_COMPILER'] = Building.COMPILER env['EMSCRIPTEN_TOOLS'] = path_from_root('tools') env['CFLAGS'] = env['EMMAKEN_CFLAGS'] = ' '.join(COMPILER_OPTS + Building.COMPILER_TEST_OPTS) # Normal CFLAGS is ignored by some configure's. |