diff options
| author | Jukka Jylanki <jjylanki@imvu.com> | 2013-05-27 13:01:23 +0300 |
|---|---|---|
| committer | Chad Austin <chad@imvu.com> | 2013-07-17 15:01:01 -0700 |
| commit | 7f0731a0b13c77a041dfc385d37c7ec509e23b9e (patch) | |
| tree | 098a933dbcd72135950ddd83655507dfb987cd26 /scons-tools/emscripten.py | |
| parent | 4495037526c02db467952c3ff73866e8a212b752 (diff) | |
Fix scons tools to use os.path.join so that windows paths don't have an exectutable name 'dir1\dir2\dir3/clang', which fails.
Diffstat (limited to 'scons-tools/emscripten.py')
| -rwxr-xr-x | scons-tools/emscripten.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scons-tools/emscripten.py b/scons-tools/emscripten.py index 473c51ad..da18b3bd 100755 --- a/scons-tools/emscripten.py +++ b/scons-tools/emscripten.py @@ -265,9 +265,9 @@ def generate(env): )
env.Replace(
- CC='${LLVM_ROOT}/${CLANG}',
- CXX='${LLVM_ROOT}/${CLANGXX}',
- AR='${LLVM_ROOT}/${LLVM_LINK}',
+ CC=os.path.join('${LLVM_ROOT}', '${CLANG}'),
+ CXX=os.path.join('${LLVM_ROOT}', '${CLANGXX}'),
+ AR=os.path.join('${LLVM_ROOT}', '${LLVM_LINK}'),
ARCOM='$AR -o $TARGET $SOURCES',
OBJSUFFIX='.bc',
LIBPREFIX='',
|