From mboxrd@z Thu Jan 1 00:00:00 1970 From: Vincent Hanquez Subject: [PATCH 6/6] default ocaml tools config variable to y Date: Mon, 1 Mar 2010 11:59:51 +0000 Message-ID: <1267444791-4810-7-git-send-email-vincent.hanquez@eu.citrix.com> References: <1267444791-4810-1-git-send-email-vincent.hanquez@eu.citrix.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="------------1.7.0" Return-path: In-Reply-To: <1267444791-4810-1-git-send-email-vincent.hanquez@eu.citrix.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xensource.com Errors-To: xen-devel-bounces@lists.xensource.com To: xen-devel@lists.xensource.com Cc: Vincent Hanquez List-Id: xen-devel@lists.xenproject.org This is a multi-part message in MIME format. --------------1.7.0 Content-Type: text/plain; charset=UTF-8; format=fixed Content-Transfer-Encoding: quoted-printable fallback mechanism if ocamlopt is not available or if we don't compile on a linux system (probably need portability fixes for solaris/netbsd/etc= ). Signed-off-by: Vincent Hanquez --- Config.mk | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) --------------1.7.0 Content-Type: text/x-patch; name="0006-default-ocaml-tools-config-variable-to-y.patch" Content-Disposition: attachment; filename="0006-default-ocaml-tools-config-variable-to-y.patch" Content-Transfer-Encoding: quoted-printable diff --git a/Config.mk b/Config.mk index a0d2be8..f36bca8 100644 --- a/Config.mk +++ b/Config.mk @@ -159,8 +159,16 @@ XENSTAT_XENTOP ?=3D y VTPM_TOOLS ?=3D n LIBXENAPI_BINDINGS ?=3D n PYTHON_TOOLS ?=3D y -OCAML_TOOLS ?=3D n +OCAML_TOOLS ?=3D y CONFIG_MINITERM ?=3D n CONFIG_LOMOUNT ?=3D n =20 +ifeq ($(OCAML_TOOLS),y) +ifeq ($(CONFIG_Linux),y) +OCAML_TOOLS :=3D $(shell ocamlopt -v > /dev/null 2>&1 && echo "y" || ech= o "n") +else +OCAML_TOOLS :=3D n +endif +endif + -include $(XEN_ROOT)/.config --------------1.7.0 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel --------------1.7.0--