]> xenbits.xensource.com Git - rumpuser-xen.git/commitdiff
nblibs is no more, so fix paths.
authorAntti Kantee <pooka@iki.fi>
Mon, 14 Jul 2014 12:12:00 +0000 (12:12 +0000)
committerAntti Kantee <pooka@iki.fi>
Mon, 14 Jul 2014 12:12:00 +0000 (12:12 +0000)
(things happened to work due to lazy globbing)

buildxen.sh

index 2dd25bf1f2c2d49fe9927c425a3366cb7546229a..757111c4084d15a90ce27e9e52a7b32735a0263c 100755 (executable)
@@ -8,25 +8,25 @@ STDJ='-j4'
 
 # the buildxen.sh is not as forgiving as I am
 set -e
+
 [ ! -f ./buildrump.sh/subr.sh ] && git submodule update --init buildrump.sh
 . ./buildrump.sh/subr.sh
 
+if git submodule status rumpsrc | grep -q '^-' ; then
+       git submodule update --init --recursive rumpsrc
+fi
+[ "$1" = "justcheckout" ] && { echo ">> $0 done" ; exit 0; }
+
 MORELIBS="external/bsd/flex/lib
        crypto/external/bsd/openssl/lib/libcrypto
        crypto/external/bsd/openssl/lib/libdes
        crypto/external/bsd/openssl/lib/libssl
        external/bsd/libpcap/lib"
-LIBS="$(echo nblibs/lib/lib* | sed 's/nblibs/rumpsrc/g')"
+LIBS="rumpsrc/lib/lib*"
 for lib in ${MORELIBS}; do
        LIBS="${LIBS} rumpsrc/${lib}"
 done
 
-if git submodule status rumpsrc | grep -q '^-' ; then
-       git submodule update --init --recursive rumpsrc
-fi
-
-[ "$1" = "justcheckout" ] && { echo ">> $0 done" ; exit 0; }
-
 # build tools
 ./buildrump.sh/buildrump.sh -${BUILDXEN_QUIET:-q} ${STDJ} -k \
     -V MKPIC=no -s rumpsrc -T rumptools -o rumpobj -N \