diff options
Diffstat (limited to 'tools/shared.py')
| -rw-r--r-- | tools/shared.py | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/tools/shared.py b/tools/shared.py index b61552ba..cecfd4ac 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. @@ -369,6 +377,8 @@ class Building: if output_processor is not None: output_processor(open(filename + '.o.js').read()) + return filename + '.o.js' + @staticmethod def pick_llvm_opts(optimization_level, safe=True): ''' @@ -472,6 +482,7 @@ class Building: f = open(filename, 'w') f.write(output) f.close() + return filename @staticmethod def eliminator(filename): @@ -486,6 +497,7 @@ class Building: f = open(filename, 'w') f.write(output) f.close() + return filename @staticmethod def closure_compiler(filename): @@ -502,3 +514,5 @@ class Building: if 'ERROR' in cc_output: raise Exception('Error in cc output: ' + cc_output) + return filename + '.cc.js' + |