From: Keir Fraser Date: Sat, 27 Aug 2011 11:20:19 +0000 (+0100) Subject: Config.mk: Include optional .config file *first* rather than *last* X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~9937^2 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=ee991a2daf8d889d0d54e377610e487b69115210;p=xen.git 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 --- 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