diff options
| author | Alon Zakai <alonzakai@gmail.com> | 2011-12-16 08:49:00 -0800 |
|---|---|---|
| committer | Alon Zakai <alonzakai@gmail.com> | 2011-12-16 08:49:00 -0800 |
| commit | 27b3e73124929a6c7ad6d3f2dbe8cf2dd9d6d0ce (patch) | |
| tree | 2196c14f71c9492533338ab2d11f50356b7cb095 | |
| parent | 99c9e8fc31869fbc8135d863cfdf242dfff149a8 (diff) | |
temporarily return emmaken to test runner instead of emcc
| -rwxr-xr-x | tools/emconfiguren.py | 2 | ||||
| -rwxr-xr-x | tools/emmaken.py | 2 | ||||
| -rw-r--r-- | tools/shared.py | 10 |
3 files changed, 7 insertions, 7 deletions
diff --git a/tools/emconfiguren.py b/tools/emconfiguren.py index d549908b..28cb6366 100755 --- a/tools/emconfiguren.py +++ b/tools/emconfiguren.py @@ -1,6 +1,6 @@ #!/usr/bin/env python -raise Exception('emconfiguren is deprecated!') +#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 89785bc5..1192eb85 100755 --- a/tools/emmaken.py +++ b/tools/emmaken.py @@ -1,6 +1,6 @@ #!/usr/bin/env python -raise Exception('emmaken is deprecated!') +#raise Exception('emmaken is deprecated!') ''' emmaken - the emscripten make proxy tool diff --git a/tools/shared.py b/tools/shared.py index cecfd4ac..eef1dd68 100644 --- a/tools/shared.py +++ b/tools/shared.py @@ -221,11 +221,11 @@ class Building: @staticmethod def get_building_env(): env = os.environ.copy() - env['CC'] = EMCC - env['CXX'] = EMXX - env['AR'] = EMAR - env['RANLIB'] = EMRANLIB - env['LIBTOOL'] = EMLIBTOOL + env['CC'] = EMMAKEN #EMCC + env['CXX'] = EMMAKEN #EMXX + env['AR'] = EMMAKEN #EMAR + env['RANLIB'] = EMMAKEN #EMRANLIB + env['LIBTOOL'] = EMMAKEN #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. |