build: Run oasis setup from configure script

Signed-off-by: Si Beaumont <simon.beaumont@citrix.com>
simonjbeaumont · Nov 13, 2015 · b22ebe9 · b22ebe9
1 parent 39a66ce
commit b22ebe9
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/Makefile b/Makefile
@@ -29,10 +29,7 @@ setup.data: setup.ml
 	ocaml setup.ml -configure $(CONFIGUREFLAGS)
 
 setup.ml: _oasis
-	@-git update-index --assume-unchanged myocamlbuild.ml 2>/dev/null
 	./configure
-	oasis setup
-	touch $@
 
 travis-coveralls.sh:
 	wget https://raw.githubusercontent.com/simonjbeaumont/ocaml-travis-coveralls/master/$@

diff --git a/configure b/configure
@@ -5,6 +5,9 @@ trap "rm -f libsanlock_check" EXIT
 (gcc stubgen/libsanlock_check.c -o libsanlock_check 2>/dev/null && ./libsanlock_check) ||
   (echo "Package needs libsanlock headers to be installed on your system."; exit 1)
 
+git update-index --assume-unchanged myocamlbuild.ml 2>/dev/null || true
+oasis setup && touch setup.ml
+
 FST=true
 for i in "$@"; do
   if $FST; then
@@ -23,3 +26,5 @@ for i in "$@"; do
       ;;
   esac
 done
+
+ocaml setup.ml -configure "$@"