Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions buildrump.sh
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ diagout ()
else
shift
fi
${DIAGOUT} $*
${DIAGOUT} ${1+"$@"}
}

#
Expand Down Expand Up @@ -240,7 +240,7 @@ cppdefines ()
cpplist="${BUILDRUMP_CPPCACHE}"
else
cpplist=$(${CC} ${EXTRA_CPPFLAGS} ${EXTRA_CFLAGS} \
-E -Wp,-dM "$@" - < /dev/null)
-E -Wp,-dM ${1+"$@"} - < /dev/null)
fi
(
IFS=' '
Expand All @@ -262,7 +262,7 @@ doesitbuild ()
warnflags="-Wmissing-prototypes -Wstrict-prototypes -Wimplicit -Werror"
printf "${theprog}" \
| ${CC} ${warnflags} ${EXTRA_LDFLAGS} ${EXTRA_CFLAGS} \
-x c - -o /dev/null $* > /dev/null 2>&1
-x c - -o /dev/null ${1+"$@"} > /dev/null 2>&1
}

doesitbuild_host ()
Expand All @@ -286,7 +286,7 @@ doesitcxx ()

printf "${theprog}" \
| ${CXX} -Werror ${EXTRA_LDFLAGS} ${EXTRA_CFLAGS} \
-x c++ - -o /dev/null $* > /dev/null 2>&1
-x c++ - -o /dev/null ${1+"$@"} > /dev/null 2>&1
}

checkcheckout ()
Expand Down Expand Up @@ -1473,7 +1473,7 @@ parseargs ()
done
ncmds=0
if [ $# -ne 0 ]; then
for arg in $*; do
for arg in "$@"; do
while true ; do
for cmd in ${allcmds}; do
if [ "${arg}" = "${cmd}" ]; then
Expand Down Expand Up @@ -1582,7 +1582,7 @@ mkmakefile ()
exec 3>&1 1>${makefile}
printf '# GENERATED FILE, MIGHT I SUGGEST NOT EDITING?\n'
printf 'SUBDIR='
for dir in $*; do
for dir in ${1+"$@"}; do
case ${dir} in
/*)
printf ' %s' ${dir}
Expand All @@ -1604,7 +1604,7 @@ domake ()
mktarget=${1}; shift

[ ! -x ${RUMPMAKE} ] && die "No rumpmake (${RUMPMAKE}). Forgot tools?"
${RUMPMAKE} $* -j ${JNUM} -f ${mkfile} ${mktarget}
${RUMPMAKE} ${1+"$@"} -j ${JNUM} -f ${mkfile} ${mktarget}
[ $? -eq 0 ] || die "make $mkfile $mktarget"
}

Expand All @@ -1623,7 +1623,7 @@ for var in CFLAGS AFLAGS LDFLAGS; do
&& die unset \"${var}\" from environment, use -F instead
done

parseargs "$@"
parseargs ${1+"$@"}

${docheckout} && { ${BRDIR}/checkout.sh ${checkoutstyle} ${SRCDIR} || exit 1; }

Expand Down