From 305ea73d1b4fbf379c4ffb491f3102525254698d Mon Sep 17 00:00:00 2001 From: Daniel De Graaf Date: Wed, 29 Feb 2012 13:40:25 +0000 Subject: build: Export configure variables to hypervisor build Since the introduction of autoconf, builds with XSM enabled in .config have been broken unless FLASK_ENABLE was explicitly set. Since the setting in .config has apparently been deprecated in favor of an autoconf --enable-xsm, add config/Xen.mk to export this to Xen. This also makes --disable-debug and some paths to be pulled from the configure process in the hypervisor build. Signed-off-by: Daniel De Graaf Committed-by: Keir Fraser --- config/Tools.mk.in | 4 ---- config/Xen.mk.in | 19 +++++++++++++++++++ 2 files changed, 19 insertions(+), 4 deletions(-) create mode 100644 config/Xen.mk.in (limited to 'config') diff --git a/config/Tools.mk.in b/config/Tools.mk.in index 06d5e8974b..315ced4945 100644 --- a/config/Tools.mk.in +++ b/config/Tools.mk.in @@ -24,10 +24,6 @@ PREPEND_LIB := @PREPEND_LIB@ APPEND_INCLUDES := @APPEND_INCLUDES@ APPEND_LIB := @APPEND_LIB@ -# Enable XSM security module (by default, Flask). -XSM_ENABLE := @xsm@ -FLASK_ENABLE := @xsm@ - # Download GIT repositories via HTTP or GIT's own protocol? # GIT's protocol is faster and more robust, when it works at all (firewalls # may block it). We make it the default, but if your GIT repository downloads diff --git a/config/Xen.mk.in b/config/Xen.mk.in new file mode 100644 index 0000000000..e152f398aa --- /dev/null +++ b/config/Xen.mk.in @@ -0,0 +1,19 @@ +# Prefix and install folder +PREFIX := @prefix@ +LIBLEAFDIR_x86_64 := @LIB_PATH@ + +# A debug build of xen? +debug := @debug@ + +# Tools path +PYTHON := @PYTHON@ + +# Extra folder for libs/includes +PREPEND_INCLUDES := @PREPEND_INCLUDES@ +PREPEND_LIB := @PREPEND_LIB@ +APPEND_INCLUDES := @APPEND_INCLUDES@ +APPEND_LIB := @APPEND_LIB@ + +# Enable XSM security module (by default, Flask). +XSM_ENABLE := @xsm@ +FLASK_ENABLE := @xsm@ -- cgit v1.2.3