Fix dolt to error out on compile error, and not print errors on race to mkdir.
Both of these changes have been submitted upstream.
This commit is contained in:
parent
a7e3ad1c6b
commit
13dcde6bf9
|
@ -65,7 +65,7 @@ dnl Write out shared compilation code.
|
||||||
cat <<'__DOLTCOMPILE__EOF__' >>doltcompile
|
cat <<'__DOLTCOMPILE__EOF__' >>doltcompile
|
||||||
libobjdir="${obj%$objbase}.libs"
|
libobjdir="${obj%$objbase}.libs"
|
||||||
if test ! -d "$libobjdir" ; then
|
if test ! -d "$libobjdir" ; then
|
||||||
mkdir "$libobjdir"
|
mkdir -p "$libobjdir"
|
||||||
mkdir_ret=$?
|
mkdir_ret=$?
|
||||||
if test "$mkdir_ret" -ne 0 && test ! -d "$libobjdir" ; then
|
if test "$mkdir_ret" -ne 0 && test ! -d "$libobjdir" ; then
|
||||||
exit $mkdir_ret
|
exit $mkdir_ret
|
||||||
|
@ -73,7 +73,7 @@ if test ! -d "$libobjdir" ; then
|
||||||
fi
|
fi
|
||||||
pic_object="$libobjdir/$objbase.o"
|
pic_object="$libobjdir/$objbase.o"
|
||||||
args@<:@$objarg@:>@="$pic_object"
|
args@<:@$objarg@:>@="$pic_object"
|
||||||
"${args@<:@@@:>@}" -fPIC -DPIC
|
"${args@<:@@@:>@}" -fPIC -DPIC || exit $?
|
||||||
__DOLTCOMPILE__EOF__
|
__DOLTCOMPILE__EOF__
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
@ -86,11 +86,11 @@ args@<:@$objarg@:>@="$non_pic_object"
|
||||||
__DOLTCOMPILE__EOF__
|
__DOLTCOMPILE__EOF__
|
||||||
if test x$enable_shared = xyes; then
|
if test x$enable_shared = xyes; then
|
||||||
cat <<'__DOLTCOMPILE__EOF__' >>doltcompile
|
cat <<'__DOLTCOMPILE__EOF__' >>doltcompile
|
||||||
"${args@<:@@@:>@}" >/dev/null 2>&1
|
"${args@<:@@@:>@}" >/dev/null 2>&1 || exit $?
|
||||||
__DOLTCOMPILE__EOF__
|
__DOLTCOMPILE__EOF__
|
||||||
else
|
else
|
||||||
cat <<'__DOLTCOMPILE__EOF__' >>doltcompile
|
cat <<'__DOLTCOMPILE__EOF__' >>doltcompile
|
||||||
"${args@<:@@@:>@}"
|
"${args@<:@@@:>@}" || exit $?
|
||||||
__DOLTCOMPILE__EOF__
|
__DOLTCOMPILE__EOF__
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
Loading…
Reference in New Issue
Block a user