Run the xen probe in a subshell.

Might fix Travis build failure.  Who knows.  Hard to say for
sure about the problems which I can't repeat locally.

diff --git a/build-rr.sh b/build-rr.sh
index 6d19448d23a80183d8ada945ed4f5953caf05a45..4054430fd42bdd64b74bdb711d01ed4546bff4fc 100755 (executable)
--- a/build-rr.sh
+++ b/build-rr.sh
@@ -211,7 +211,8 @@ checksubmodules ()
 probeprereqs ()
 {
 
-       if [ "${PLATFORM}" = "xen" ]; then
+       if [ "${PLATFORM}" = "xen" ]; then (
+               . "${RROBJ}/config.sh"
                # probe location of Xen headers
                found=false
                for loc in /usr/pkg/include/xen /usr/include/xen; do
@@ -231,7 +232,7 @@ probeprereqs ()
                        echo '>> The exactly source depends on your system'
                        echo '>> (e.g. libxen-dev package on some systems)'
                        die Xen headers not found
-               fi
+               fi )
        fi
 }
 
@@ -325,8 +326,6 @@ export RUMPRUN_SHCONF="${RROBJ}/config.sh"
 EOF
        export RUMPRUN_MKCONF="${RROBJ}/config.mk"
 
-       . "${RROBJ}/config.sh"
-
        probeprereqs
 
        cat >> ${RUMPTOOLS}/mk.conf << EOF