Merge branch 'experimental/upstream' into upstream

1 files changed, 6 insertions, 2 deletions

diff --git a/build b/build
index 69b47239..4fca642e 100755
--- a/build
+++ b/build
@@ -5,17 +5,21 @@ OCAMLBUILD=ocamlbuild
 CFG=config/coq_config.ml
 MYCFG=myocamlbuild_config.ml
 
+export CAML_LD_LIBRARY_PATH=`pwd`/_build/kernel/byterun
+
 check_config() {
  [ -f $CFG ] || (echo "please run ./configure first"; exit 1)
  [ -L $MYCFG ] || ln -sf $CFG $MYCFG
 }
 
-ocb() { $OCAMLBUILD $FLAGS $*; }
+# NB: we exec ocamlbuild and run ocb last for a correct exit code
+
+ocb() { exec $OCAMLBUILD $FLAGS $*; }
 
 rule() {
   check_config
   case $1 in
-    clean)  ocb -clean && rm -rf bin/* && rm -f $MYCFG;;
+    clean)  rm -rf bin/* $MYCFG && ocb -clean;;
     all)    ocb coq.otarget;;
     win32)  ocb coq-win32.otarget;;
     *)      ocb $1;;