Fix scons tools to use os.path.join so that windows paths don't have an exectutable name 'dir1\dir2\dir3/clang', which fails.

2 files changed, 7 insertions, 6 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='',

diff --git a/scons-tools/llvm.py b/scons-tools/llvm.py
index f272bd16..2dc65dd3 100755
--- a/scons-tools/llvm.py
+++ b/scons-tools/llvm.py
@@ -1,5 +1,6 @@
 from SCons.Scanner.Prog import scan
 from SCons.Builder import Builder
+import os
 
 def exists(env):
     return True
@@ -23,11 +24,11 @@ def generate(env):
         LLVM_LINK='llvm-link')
     
     env['BUILDERS']['LLVMDis'] = Builder(
-        action='${LLVM_ROOT}/$LLVM_DIS -o=$TARGET $SOURCE')
+        action=os.path.join('${LLVM_ROOT}', '$LLVM_DIS') + ' -o=$TARGET $SOURCE')
 
     env['BUILDERS']['LLVMOpt'] = Builder(
-        action='${LLVM_ROOT}/$LLVM_OPT $LLVM_OPT_FLAGS $LLVM_OPT_PASSES -o=$TARGET $SOURCE')
+        action=os.path.join('${LLVM_ROOT}', '$LLVM_OPT') + ' $LLVM_OPT_FLAGS $LLVM_OPT_PASSES -o=$TARGET $SOURCE')
 
     env['BUILDERS']['LLVMLink'] = Builder(
-        action='${LLVM_ROOT}/$LLVM_LINK -o=$TARGET $SOURCES',
+        action=os.path.join('${LLVM_ROOT}', '$LLVM_LINK') + ' -o=$TARGET $SOURCES',
         emitter=add_libraries)