]> xenbits.xensource.com Git - osstest/rumprun.git/commitdiff
Tiny fix absolute path -o option.
authoryarl <5469248+yarlB@users.noreply.github.com>
Sun, 8 Apr 2018 14:20:40 +0000 (16:20 +0200)
committeryarl <5469248+yarlB@users.noreply.github.com>
Sun, 8 Apr 2018 14:20:40 +0000 (16:20 +0200)
build-rr.sh

index 933525af6dd059f46b7ae281d42e685c4f2806ef..8de8710e839f63e472948dcd5b1d280de2f75bcf 100755 (executable)
@@ -290,12 +290,12 @@ setvars ()
                RROBJ="./obj-${MACHINE}-${PLATFORM}${GITBRANCH}${EXTSRC}"
                ${KERNONLY} && RROBJ="${RROBJ}-kernonly"
        fi
+       abspath RROBJ
        STAGING="${RROBJ}/dest.stage"
        BROBJ="${RROBJ}/buildrump.sh"
        RUMPTOOLS="${RROBJ}/rumptools"
 
        abspath RRDEST
-       abspath RROBJ
        abspath RUMPSRC
 }
 
@@ -371,7 +371,7 @@ buildrump ()
        echo '>> further setup for rumprun build'
        echo '>>'
 
-       RUMPMAKE=$(pwd)/${RUMPTOOLS}/rumpmake
+       RUMPMAKE=${RUMPTOOLS}/rumpmake
 
        TOOLTUPLE=$(${RUMPMAKE} -f bsd.own.mk \
            -V '${MACHINE_GNU_PLATFORM:S/--netbsd/-rumprun-netbsd/}')
@@ -477,7 +477,7 @@ makeconfig ()
        echo "BUILDRUMP=${quote}${BUILDRUMP}${quote}" > ${1}
        echo "RUMPSRC=${quote}${RUMPSRC}${quote}" >> ${1}
        echo "RUMPMAKE=${quote}${RUMPMAKE}${quote}" >> ${1}
-       echo "BUILDRUMP_TOOLFLAGS=${quote}$(pwd)/${RUMPTOOLS}/toolchain-conf.mk${quote}" >> ${1}
+       echo "BUILDRUMP_TOOLFLAGS=${quote}${RUMPTOOLS}/toolchain-conf.mk${quote}" >> ${1}
        echo "MACHINE=${quote}${MACHINE}${quote}" >> ${1}
        echo "MACHINE_GNU_ARCH=${quote}${MACHINE_GNU_ARCH}${quote}" >> ${1}
        echo "TOOLTUPLE=${quote}${TOOLTUPLE}${quote}" >> ${1}