diff options
| author | Mike McClurg <mike.mcclurg@citrix.com> | 2011-07-21 14:40:39 +0100 |
|---|---|---|
| committer | Mike McClurg <mike.mcclurg@citrix.com> | 2011-07-21 14:40:39 +0100 |
| commit | 93e2a6c05e4f8aca9575adafbd7819439bdcd2f5 (patch) | |
| tree | dc87032250901b2e98ed29d172db6d31896f5de5 | |
| parent | 3e03d7cc666204c78251ca193fd16900a9689bb0 (diff) | |
| download | xen-93e2a6c05e4f8aca9575adafbd7819439bdcd2f5.tar.gz xen-93e2a6c05e4f8aca9575adafbd7819439bdcd2f5.tar.bz2 xen-93e2a6c05e4f8aca9575adafbd7819439bdcd2f5.zip | |
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@citrix.com>
Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
Committed-by: Ian Jackson <ian.jackson@eu.citrix.com>
xen-unstable changeset: 23566:7e5b54d1643e
xen-unstable date: Tue Jun 21 18:01:51 2011 +0100
| -rw-r--r-- | tools/ocaml/common.make | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/ocaml/common.make b/tools/ocaml/common.make index f45a3e45bb..ee4d200f63 100644 --- a/tools/ocaml/common.make +++ b/tools/ocaml/common.make @@ -10,7 +10,7 @@ OCAMLYACC ?= ocamlyacc 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') |