aboutsummaryrefslogtreecommitdiffstats
path: root/Config.mk
diff options
context:
space:
mode:
authorKeir Fraser <keir@xen.org>2011-08-27 12:20:19 +0100
committerKeir Fraser <keir@xen.org>2011-08-27 12:20:19 +0100
commitee991a2daf8d889d0d54e377610e487b69115210 (patch)
treea8d90f01fb506d25da847907cf232b9c9d5f4eed /Config.mk
parent32e447cde1d68777f15efd64f0d836e01646e4a3 (diff)
downloadxen-ee991a2daf8d889d0d54e377610e487b69115210.tar.gz
xen-ee991a2daf8d889d0d54e377610e487b69115210.tar.bz2
xen-ee991a2daf8d889d0d54e377610e487b69115210.zip
Config.mk: Include optional .config file *first* rather than *last*
Allows the core of Config.mk to correctly respond to any configuration overrides specified in the .config file. Signed-off-by: Keir Fraser <keir@xen.org>
Diffstat (limited to 'Config.mk')
-rw-r--r--Config.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/Config.mk b/Config.mk
index 2632e3ee2d..6505697df1 100644
--- a/Config.mk
+++ b/Config.mk
@@ -1,5 +1,7 @@
# -*- mode: Makefile; -*-
+-include $(XEN_ROOT)/.config
+
# A debug build of Xen and tools?
debug ?= y
@@ -223,5 +225,3 @@ CONFIG_LOMOUNT ?= n
ifeq ($(OCAML_TOOLS),y)
OCAML_TOOLS := $(shell ocamlopt -v > /dev/null 2>&1 && echo "y" || echo "n")
endif
-
--include $(XEN_ROOT)/.config