[Xen-changelog] [xen-4.1-testing] tools/ocaml: ask compiler for correct library

[Xen patchbot-4.1-testing <patchbot@xxxxxxx>]

# HG changeset patch
# User Mike McClurg <mike.mcclurg@xxxxxxxxxx>
# Date 1311255639 -3600
# Node ID 24fa05d9037db3b078ec8062dd3894998d278d81
# Parent  1976adbf2b807e505fdf0356c29ec0c0499ed533
tools/ocaml: ask compiler for correct library

OCaml libraries will live in /usr/local/ if the user compiles OCaml
from source. This patch asks the OCaml compiler where we should look
for libraries.

NB: it may be that we should do the same thing for the NetBSD case,
but I don't have a BSD box to test this out.

Signed-off-by: Mike McClurg <mike.mcclurg@xxxxxxxxxx>
Signed-off-by: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
Committed-by: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
xen-unstable changeset:   23566:7e5b54d1643e
xen-unstable date:        Tue Jun 21 18:01:51 2011 +0100
---


diff -r 1976adbf2b80 -r 24fa05d9037d tools/ocaml/common.make
--- a/tools/ocaml/common.make   Wed Jul 20 15:25:34 2011 +0100
+++ b/tools/ocaml/common.make   Thu Jul 21 14:40:39 2011 +0100
@@ -10,7 +10,7 @@
 
 CFLAGS += -fPIC -Werror
 CFLAGS += -I$(TOPLEVEL)/../include -I$(TOPLEVEL)/../libxc 
-I$(TOPLEVEL)/../xenstore -I$(TOPLEVEL)/../libxl
-CFLAGS-$(CONFIG_Linux) += -I/usr/lib64/ocaml -I/usr/lib/ocaml
+CFLAGS-$(CONFIG_Linux) += -I$(shell ocamlc -where)
 CFLAGS-$(CONFIG_NetBSD) += -I/usr/pkg/lib/ocaml -fPIC
 
 OCAMLOPTFLAG_G := $(shell $(OCAMLOPT) -h 2>&1 | sed -n 's/^  *\(-g\) .*/\1/p')

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog