Update buildrump.sh and use new "probe" method.

The new probe method doesn't require any directories
to be created.

diff --git a/build-rr.sh b/build-rr.sh
index b4d995e7d71e746d24ca8a27c45f8b52565c2856..465e3e079675213c04c2f3f1d1a33c3ba1bcc3f3 100755 (executable)
--- a/build-rr.sh
+++ b/build-rr.sh
@@ -235,7 +235,8 @@ checkprevbuilds ()
 setvars ()
 {
 
-       . ${RUMPTOOLS}/proberes.sh
+       # probe us some vars
+       eval $(${BUILDRUMP}/buildrump.sh "$@" probe)
        MACHINE="${BUILDRUMP_MACHINE}"
        MACHINE_GNU_ARCH="${BUILDRUMP_MACHINE_GNU_ARCH}"
 
@@ -254,11 +255,6 @@ setvars ()
 buildrump ()
 {
 
-       # probe
-       ${BUILDRUMP}/buildrump.sh -k -s ${RUMPSRC} -T ${RUMPTOOLS} "$@" probe
-
-       setvars
-
        # Check that a clang build is not attempted.
        [ -z "${BUILDRUMP_HAVE_LLVM}" ] \
            || die rumprun does not yet support clang ${CC:+(\$CC: $CC)}
@@ -424,8 +420,6 @@ dobuild ()
 doinstall ()
 {
 
-       setvars
-
        # default used to be a symlink, so this is for "compat".
        # remove in a few months.
        rm -f ${RRDEST} > /dev/null 2>&1 || true
@@ -465,6 +459,7 @@ doinstall ()
 parseargs "$@"
 shift ${ARGSSHIFT}
 
+setvars "$@"
 ${DObuild} && dobuild "$@"
 ${DOinstall} && doinstall
 

diff --git a/buildrump.sh b/buildrump.sh
index 6294a7b4410cbc57d78831bcc55e8df4c371d257..a61d89b16df848fe18a7e4f896c37fadcf241ef1 160000 (submodule)
--- a/buildrump.sh
+++ b/buildrump.sh
@@ -1 +1 @@
-Subproject commit 6294a7b4410cbc57d78831bcc55e8df4c371d257
+Subproject commit a61d89b16df848fe18a7e4f896c37fadcf241ef1