From 44116b682f926e749d1cf1922c93bf371cba193c Mon Sep 17 00:00:00 2001 From: Ralf Jung <post@ralfj.de> Date: Tue, 29 Nov 2016 09:53:54 +0100 Subject: [PATCH] fix for make build-dep to update changed dependencies --- Makefile | 10 ++++++++-- build/opam-ci.sh | 2 +- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index c09b64ca..aac88873 100644 --- a/Makefile +++ b/Makefile @@ -1,3 +1,8 @@ +# Process flags +ifeq ($(Y), 1) + YFLAG=-y +endif + # Determine Coq version COQ_VERSION=$(shell coqc --version | egrep -o 'version 8.[0-9]' | egrep -o '8.[0-9]') COQ_MAKEFILE_FLAGS ?= @@ -28,8 +33,9 @@ Makefile.coq: _CoqProject Makefile # Install build-dependencies build-dep: cat opam.pins | build/opam-pins.sh - opam pin add coq-lambda-rust "$$(pwd)#HEAD" -k git -y -n - opam install coq-lambda-rust --deps-only -y + opam upgrade $(YFLAG) + opam pin add coq-lambda-rust "$$(pwd)#HEAD" -k git -n -y + opam install coq-lambda-rust --deps-only $(YFLAG) # some fiels that do *not* need to be forwarded to Makefile.coq Makefile: ; diff --git a/build/opam-ci.sh b/build/opam-ci.sh index dadba5da..95f19e83 100755 --- a/build/opam-ci.sh +++ b/build/opam-ci.sh @@ -27,7 +27,7 @@ done # Install/upgrade build-dependencies echo opam upgrade -y -make build-dep +make build-dep Y=1 # done echo -- GitLab