summaryrefslogtreecommitdiff
path: root/bjam
diff options
context:
space:
mode:
authorKenneth Heafield <github@kheafield.com>2012-09-11 14:23:39 +0100
committerKenneth Heafield <github@kheafield.com>2012-09-11 14:27:52 +0100
commit7aa4baf365a80380bebacfc4d4a1ef1b9d757590 (patch)
tree17d6cce5219783904ab8ee05865608bfeb7fc4be /bjam
parent8a3b40e47575d0013bcab7294aa5f1d73107dd12 (diff)
Update kenlm and build system
Diffstat (limited to 'bjam')
-rwxr-xr-xbjam4
1 files changed, 2 insertions, 2 deletions
diff --git a/bjam b/bjam
index d1ac8a55..2b0232c8 100755
--- a/bjam
+++ b/bjam
@@ -4,8 +4,8 @@ if
bjam="$(which bjam 2>/dev/null)" && #exists
[ ${#bjam} != 0 ] && #paranoia about which printing nothing then returning true
! grep UFIHGUFIHBDJKNCFZXAEVA "${bjam}" </dev/null >/dev/null && #bjam in path isn't this script
- "${bjam}" --help >/dev/null 2>/dev/null && #bjam in path isn't broken (i.e. has boost-build)
- "${bjam}" --version |grep "Boost.Build 201" >/dev/null 2>/dev/null #It's recent enough.
+ "${bjam}" --sanity-test 2>/dev/null |grep Sane >/dev/null && #The test in jam-files/sanity.jam passes
+ (cd jam-files/fail && ! "${bjam}") >/dev/null #Returns non-zero on failure
then
#Delegate to system bjam
exec "${bjam}" "$@"