diff options
| author | Jukka Jylänki <jujjyl@gmail.com> | 2012-11-14 00:23:02 +0200 |
|---|---|---|
| committer | Jukka Jylänki <jujjyl@gmail.com> | 2012-11-14 00:55:11 +0200 |
| commit | ef0fa03b4bc2b3f2cc0f786443d61696774185ab (patch) | |
| tree | 19e2be88d211a2a83568b35202a72bd54c888e72 /tests/runner.py | |
| parent | f6eaab6a2563efb3a541c324880b0219d288f4f9 (diff) | |
Try to locate emcc in cmake based on the cmake toolchain directory structure to avoid having to set EMSCRIPTEN environment variable on unix. Remove the temporary workaround for other.test_cmake, which shouldn't now be needed.
Diffstat (limited to 'tests/runner.py')
| -rwxr-xr-x | tests/runner.py | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/tests/runner.py b/tests/runner.py index 0fe740ce..26073cd7 100755 --- a/tests/runner.py +++ b/tests/runner.py @@ -7530,8 +7530,6 @@ f.close() # understands Windows paths, and cygwin make additionally produces a cryptic 'not valid bitcode file' errors on files that # *are* valid bitcode files. - os.environ['EMSCRIPTEN'] = path_from_root('') # XXX FIXME this should be done in emconfigure - if os.name == 'nt': make_command = 'mingw32-make' emscriptencmaketoolchain = path_from_root('cmake', 'Platform', 'Emscripten.cmake') |