aboutsummaryrefslogtreecommitdiff
path: root/tools/shared.py
diff options
context:
space:
mode:
authorAlon Zakai <alonzakai@gmail.com>2013-07-02 21:27:28 -0700
committerAlon Zakai <alonzakai@gmail.com>2013-07-02 21:27:28 -0700
commitfc397a94391958b13c06762957961f73447dabc9 (patch)
tree9cee7abeffa218291920e511143529605ef77bf9 /tools/shared.py
parent0a2260ada3aa52de22168396b72de8851d3ca415 (diff)
parentfe3655daf9fb8834c974085a2d8ae6185cd19109 (diff)
Merge pull request #1343 from int3/firstrun-paths
Fix and test for find_executable.
Diffstat (limited to 'tools/shared.py')
-rw-r--r--tools/shared.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/shared.py b/tools/shared.py
index 776001cd..2c352f1c 100644
--- a/tools/shared.py
+++ b/tools/shared.py
@@ -205,7 +205,7 @@ else:
config_file = '\n'.join(config_file)
# autodetect some default paths
config_file = config_file.replace('{{{ EMSCRIPTEN_ROOT }}}', __rootpath__)
- llvm_root = find_executable('llvm-dis') or '/usr/bin'
+ llvm_root = os.path.dirname(find_executable('llvm-dis') or '/usr/bin/llvm-dis')
config_file = config_file.replace('{{{ LLVM_ROOT }}}', llvm_root)
node = find_executable('node') or find_executable('nodejs') or 'node'
config_file = config_file.replace('{{{ NODE }}}', node)