diff options
| author | Eric Anholt <eric@anholt.net> | 2008-04-10 11:08:49 -0700 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2008-04-10 11:08:49 -0700 |
| commit | 13dcde6bf994fae09c67c3edce9de42df61ef043 (patch) | |
| tree | ab6c183f58aea3d95f22986cc7cf73c67a5a0df2 | |
| parent | a7e3ad1c6b455bda7c4abb352a20845d1d4574a0 (diff) | |
Fix dolt to error out on compile error, and not print errors on race to mkdir.
Both of these changes have been submitted upstream.
| -rw-r--r-- | acinclude.m4 | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 0d31e857f..cbb68e19e 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -65,7 +65,7 @@ dnl Write out shared compilation code. cat <<'__DOLTCOMPILE__EOF__' >>doltcompile libobjdir="${obj%$objbase}.libs" if test ! -d "$libobjdir" ; then - mkdir "$libobjdir" + mkdir -p "$libobjdir" mkdir_ret=$? if test "$mkdir_ret" -ne 0 && test ! -d "$libobjdir" ; then exit $mkdir_ret @@ -73,7 +73,7 @@ if test ! -d "$libobjdir" ; then fi pic_object="$libobjdir/$objbase.o" args@<:@$objarg@:>@="$pic_object" -"${args@<:@@@:>@}" -fPIC -DPIC +"${args@<:@@@:>@}" -fPIC -DPIC || exit $? __DOLTCOMPILE__EOF__ fi @@ -86,11 +86,11 @@ args@<:@$objarg@:>@="$non_pic_object" __DOLTCOMPILE__EOF__ if test x$enable_shared = xyes; then cat <<'__DOLTCOMPILE__EOF__' >>doltcompile -"${args@<:@@@:>@}" >/dev/null 2>&1 +"${args@<:@@@:>@}" >/dev/null 2>&1 || exit $? __DOLTCOMPILE__EOF__ else cat <<'__DOLTCOMPILE__EOF__' >>doltcompile -"${args@<:@@@:>@}" +"${args@<:@@@:>@}" || exit $? __DOLTCOMPILE__EOF__ fi fi |