diff options
| author | Marcelo Fernandez <marcelofg55@gmail.com> | 2017-10-28 16:24:44 -0300 |
|---|---|---|
| committer | Marcelo Fernandez <marcelofg55@gmail.com> | 2017-10-28 16:24:44 -0300 |
| commit | 33daf4d8bc17f30c85cefe2e9dfe9b46ddb257f9 (patch) | |
| tree | 80bc02a9588941fc7bed52d4402f3d4b63fab7bb /platform | |
| parent | c93a3c1bd90c3416048e41328e7d787419828722 (diff) | |
Detect javascript platform using EMSCRIPTEN env as well
Diffstat (limited to 'platform')
| -rw-r--r-- | platform/javascript/detect.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/platform/javascript/detect.py b/platform/javascript/detect.py index cc29ad8956..a2988d9c60 100644 --- a/platform/javascript/detect.py +++ b/platform/javascript/detect.py @@ -13,7 +13,7 @@ def get_name(): def can_build(): - return ("EMSCRIPTEN_ROOT" in os.environ) + return ("EMSCRIPTEN_ROOT" in os.environ or "EMSCRIPTEN" in os.environ) def get_opts(): @@ -66,7 +66,10 @@ def configure(env): ## Compiler configuration env['ENV'] = os.environ - env.PrependENVPath('PATH', os.environ['EMSCRIPTEN_ROOT']) + if ("EMSCRIPTEN_ROOT" in os.environ): + env.PrependENVPath('PATH', os.environ['EMSCRIPTEN_ROOT']) + elif ("EMSCRIPTEN" in os.environ): + env.PrependENVPath('PATH', os.environ['EMSCRIPTEN']) env['CC'] = 'emcc' env['CXX'] = 'em++' env['LINK'] = 'emcc' |