projects
/
xen.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
5469342
)
ocaml: Build components by default on Linux if toolchain installed.
author
Keir Fraser
<keir.fraser@citrix.com>
Thu, 6 May 2010 10:10:02 +0000
(11:10 +0100)
committer
Keir Fraser
<keir.fraser@citrix.com>
Thu, 6 May 2010 10:10:02 +0000
(11:10 +0100)
Signed-off-by: Vincent Hanquez <vincent.hanquez@eu.citrix.com>
Config.mk
patch
|
blob
|
history
diff --git
a/Config.mk
b/Config.mk
index b42ca40438a2c9ef7e16ac105272733fafd68058..903f01592473f9de1d2c927ceb0adb7866aaea35 100644
(file)
--- a/
Config.mk
+++ b/
Config.mk
@@
-163,8
+163,16
@@
XENSTAT_XENTOP ?= y
VTPM_TOOLS ?= n
LIBXENAPI_BINDINGS ?= n
PYTHON_TOOLS ?= y
-OCAML_TOOLS ?=
n
+OCAML_TOOLS ?=
y
CONFIG_MINITERM ?= n
CONFIG_LOMOUNT ?= n
+ifeq ($(OCAML_TOOLS),y)
+ifeq ($(CONFIG_Linux),y)
+OCAML_TOOLS := $(shell ocamlopt -v > /dev/null 2>&1 && echo "y" || echo "n")
+else
+OCAML_TOOLS := n
+endif
+endif
+
-include $(XEN_ROOT)/.config