From: Ian Jackson <ian.jackson@eu.citrix.com>
Date: Thu, 26 May 2016 15:14:05 +0000 (+0100)
Subject: Search existing value of XEN_HEADERS for Xen headers
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=3104392cc1073e1a30d9c8baf5d44a9e162e816e;p=osstest%2Frumprun.git

Search existing value of XEN_HEADERS for Xen headers

This allows a caller to specify a specific location for the Xen
headers.  For example, from a version of Xen just built in a
neighbouring directory.

(Without this it is not possible to build against a specific Xen
without being able to overwrite system header areas.)

If XEN_HEADERS is unset, or not suitable, use the existing search
strategy.

Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
---

diff --git a/build-rr.sh b/build-rr.sh
index 30054ca..2bb318b 100755
--- a/build-rr.sh
+++ b/build-rr.sh
@@ -229,7 +229,7 @@ probeprereqs ()
 		. "${RROBJ}/config.sh"
 		# probe location of Xen headers
 		found=false
-		for loc in /usr/pkg/include/xen /usr/include/xen; do
+		for loc in ${XEN_HEADERS:-} /usr/pkg/include/xen /usr/include/xen; do
 			if printf '#include <stdint.h>\n#include <xen.h>\n'\
 			    | ${CC} -I${loc} -x c - -c -o /dev/null \
 			    >/dev/null 2>&1 ; then