diff options
| author | Alon Zakai <alonzakai@gmail.com> | 2013-08-08 14:44:19 -0700 |
|---|---|---|
| committer | Alon Zakai <alonzakai@gmail.com> | 2013-08-08 14:44:19 -0700 |
| commit | 3284c0b5aa51e049c1af7af038e90b9099a7b00c (patch) | |
| tree | a7aad2875437ac8b409ec31247d0ca1a0cbd4356 /scons-tools/llvm.py | |
| parent | d65c3474df9dd630fd1809f03a2650f6564cf963 (diff) | |
| parent | 8e5bdd53c51bb50e61c5a7a312e0c1f17f3da327 (diff) | |
Merge pull request #1403 from imvu/scons-updates-pull-request
Bring SCons integration up to date with latest incoming and fix some SCons build reliability issues and races
Diffstat (limited to 'scons-tools/llvm.py')
| -rwxr-xr-x | scons-tools/llvm.py | 7 |
1 files changed, 4 insertions, 3 deletions
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) |