diff options
author | Kenneth Heafield <github@kheafield.com> | 2011-12-05 15:01:34 +0400 |
---|---|---|
committer | Kenneth Heafield <github@kheafield.com> | 2011-12-05 15:01:34 +0400 |
commit | 2c53b59defa4d7521d240019b469f8fde49d594e (patch) | |
tree | 7d216bfa01cb45dcb5ea6a9824d1f0c3e9d1091d /Jamroot | |
parent | 761be56e74d16d26d37c138b862e91e71bed9383 (diff) |
Clean train-model-perl even if --with-giza isn't passed.
Diffstat (limited to 'Jamroot')
-rw-r--r-- | Jamroot | 7 |
1 files changed, 4 insertions, 3 deletions
@@ -69,8 +69,9 @@ rule _shell ( cmd : extras * ) { import option ; -cleaning = [ option.get "clean" : : yes ] ; +local cleaning = [ option.get "clean" : : yes ] ; cleaning ?= [ option.get "clean-all" : no : yes ] ; +constant CLEANING : $(cleaning) ; #Run g++ with empty main and these arguments to see if it passes. rule test_flags ( flags ) { @@ -105,7 +106,7 @@ if $(with-boost) { } boost-shell = [ SHELL "g++ "$(I-boost-include)" -dM -x c++ -E /dev/null -include boost/version.hpp 2>/dev/null |grep '#define BOOST_VERSION '" : exit-status ] ; -if $(boost-shell[2]) != 0 && $(cleaning) = no { +if $(boost-shell[2]) != 0 && $(CLEANING) = no { exit Boost does not seem to be installed or g++ is confused. : 1 ; } boost-version = [ MATCH "#define BOOST_VERSION ([0-9]*)" : $(boost-shell[1]) ] ; @@ -184,7 +185,7 @@ build-project moses-cmd/src ; build-project moses-chart-cmd/src ; #Scripts have their own binaries. build-project scripts ; -#Regression tests (only enabled if --data-dir is passed) +#Regression tests (only does anything if --with-regtest is passed) build-project regression-testing ; if [ option.get "git" : : "yes" ] { |