aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChad Austin <chad@imvu.com>2013-02-04 14:14:59 -0800
committerChad Austin <chad@imvu.com>2013-03-04 19:34:54 -0800
commitd84a4ec1a48534211afc89590bd04af4cfd27f13 (patch)
tree9811ee0c96b0bff4f183d3c0f9af6061652fb0da
parent77ec50ce8f267f0c2d3078f2459aa5f4cc32d431 (diff)
Don't change cwd when running compiler.js. This allows us to use relative paths for things like shell files and temp directories. This is important especially on Cygwin/Windows because Cygwin and Windows have different absolute paths.
-rwxr-xr-xemscripten.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/emscripten.py b/emscripten.py
index da21b1b0..19da6268 100755
--- a/emscripten.py
+++ b/emscripten.py
@@ -41,8 +41,7 @@ def process_funcs((i, funcs, meta, settings_file, compiler, forwarded_file, libr
compiler,
engine=compiler_engine,
args=[settings_file, funcs_file, 'funcs', forwarded_file] + libraries,
- stdout=subprocess.PIPE,
- cwd=path_from_root('src'))
+ stdout=subprocess.PIPE)
tempfiles.try_delete(funcs_file)
return out
@@ -676,7 +675,7 @@ WARNING: You should normally never use this! Use emcc instead.
cache = cache_module.Cache()
temp_files.run_and_clean(lambda: main(
keywords,
- compiler_engine=os.path.abspath(keywords.compiler),
+ compiler_engine=keywords.compiler,
cache=cache,
jcache=cache_module.JCache(cache) if keywords.jcache else None,
relooper=relooper,