From c09633c4fb890dcfd2d6781c9dfcaf02961fb64f Mon Sep 17 00:00:00 2001 From: tonio Date: Fri, 27 Jan 2006 19:03:16 +0000 Subject: Do not use the wrapper for ocaml (the wrapper is incorrect then, it tries to pass -cclib as argument, but this is not an argument for ocaml) Instead, create a symlink for ocaml (this was causing problems in coq configure, which runs ocaml to detect its version) --- lang/ocaml/buildlink3.mk | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'lang/ocaml/buildlink3.mk') diff --git a/lang/ocaml/buildlink3.mk b/lang/ocaml/buildlink3.mk index 7a18cd80506..e7a27f48d91 100644 --- a/lang/ocaml/buildlink3.mk +++ b/lang/ocaml/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.12 2005/02/04 21:35:51 adrianp Exp $ +# $NetBSD: buildlink3.mk,v 1.13 2006/01/27 19:03:16 tonio Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ OCAML_BUILDLINK3_MK:= ${OCAML_BUILDLINK3_MK}+ @@ -24,8 +24,9 @@ PRINT_PLIST_AWK+= /^@dirrm lib\/ocaml$$/ \ { print "@comment in ocaml: " $$0; next } BUILDLINK_TARGETS+= ocaml-wrappers -OCAML_WRAPPERS= ocaml ocamlc ocamlc.opt ocamlcp ocamlmklib ocamlmktop \ +OCAML_WRAPPERS= ocamlc ocamlc.opt ocamlcp ocamlmklib ocamlmktop \ ocamlopt ocamlopt.opt +OCAMLBIN_WRAPPERS= ocaml ocaml-wrappers: ${_PKG_SILENT}${_PKG_DEBUG} \ @@ -38,6 +39,10 @@ ocaml-wrappers: >${BUILDLINK_DIR}/bin/$$w; \ ${CHMOD} +x ${BUILDLINK_DIR}/bin/$$w; \ done + for w in ${OCAMLBIN_WRAPPERS}; do \ + ${LN} -s ${BUILDLINK_PREFIX.ocaml}/bin/$$w \ + ${BUILDLINK_DIR}/bin/$$w; \ + done .endif # OCAML_BUILDLINK3_MK -- cgit v1.2.3