git: 29410e20d1de - main - devel/ocaml-opam: pass correct $(CC) value to the bootstrap script
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 19 Apr 2022 07:45:20 UTC
The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=29410e20d1de876478fde6e4bc80b8b0823b1184 commit 29410e20d1de876478fde6e4bc80b8b0823b1184 Author: Alexey Dokuchaev <danfe@FreeBSD.org> AuthorDate: 2022-04-19 07:44:06 +0000 Commit: Alexey Dokuchaev <danfe@FreeBSD.org> CommitDate: 2022-04-19 07:44:06 +0000 devel/ocaml-opam: pass correct $(CC) value to the bootstrap script Otherwise it could be guessed wrongly and the build would fail, as happens e.g. when ccache(1) tarball is extracted under /opt in the build jail (tinderbox). --- devel/ocaml-opam/files/patch-Makefile | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/devel/ocaml-opam/files/patch-Makefile b/devel/ocaml-opam/files/patch-Makefile new file mode 100644 index 000000000000..76bc788026c4 --- /dev/null +++ b/devel/ocaml-opam/files/patch-Makefile @@ -0,0 +1,11 @@ +--- Makefile.orig 2021-12-07 16:13:53 UTC ++++ Makefile +@@ -252,7 +252,7 @@ endif + + .PHONY: compiler cold + compiler: +- env MAKE=$(MAKE) BOOTSTRAP_EXTRA_OPTS= BOOTSTRAP_OPT_TARGET=opt.opt BOOTSTRAP_ROOT=.. BOOTSTRAP_DIR=bootstrap ./shell/bootstrap-ocaml.sh $(OCAML_PORT) ++ env CC="$(CC)" MAKE=$(MAKE) BOOTSTRAP_EXTRA_OPTS= BOOTSTRAP_OPT_TARGET=opt.opt BOOTSTRAP_ROOT=.. BOOTSTRAP_DIR=bootstrap ./shell/bootstrap-ocaml.sh $(OCAML_PORT) + + src_ext/secondary/ocaml/bin/ocaml: + env MAKE=$(MAKE) BOOTSTRAP_EXTRA_OPTS="--disable-ocamldoc --disable-debug-runtime --disable-debugger" BOOTSTRAP_OPT_TARGET=opt BOOTSTRAP_ROOT=../.. BOOTSTRAP_DIR=src_ext/secondary ./shell/bootstrap-ocaml.sh $(OCAML_PORT)