summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlon Zakai <alonzakai@gmail.com>2016-01-16 19:46:07 -0800
committerAlon Zakai <alonzakai@gmail.com>2016-01-17 11:57:10 -0800
commit8d2e027a90399020f20e15076f911ee27767da9a (patch)
treedbbc58eec5812df35d5d34351aa61bd82309734f
parentc2b77f33023d7946c8024cdc81428b4880c4b44c (diff)
downloadbinaryen-8d2e027a90399020f20e15076f911ee27767da9a.tar.gz
binaryen-8d2e027a90399020f20e15076f911ee27767da9a.tar.bz2
binaryen-8d2e027a90399020f20e15076f911ee27767da9a.zip
update waterfall build dir
-rwxr-xr-xcheck.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/check.py b/check.py
index 482556647..a96910f7e 100755
--- a/check.py
+++ b/check.py
@@ -102,7 +102,7 @@ if not has_emcc:
BASE_DIR = os.path.abspath('test')
WATERFALL_BUILD_DIR = os.path.join(BASE_DIR, 'wasm-install')
-BIN_DIR = os.path.abspath(os.path.join(WATERFALL_BUILD_DIR, 'bin'))
+BIN_DIR = os.path.abspath(os.path.join(BASE_DIR, 'waterfall_build', 'llvm-install', 'bin'))
def fetch_waterfall():
rev = open(os.path.join('test', 'revision')).read()
@@ -118,8 +118,8 @@ def setup_waterfall():
try:
subprocess.check_call([os.path.join(BIN_DIR, 'clang'), '-v'], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
os.environ['LLVM'] = BIN_DIR
- except:
- warn('could not run vanilla LLVM from waterfall')
+ except Exception, e:
+ warn('could not run vanilla LLVM from waterfall: ' + str(e))
fetch_waterfall()
setup_waterfall()