bootstrap.1 | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
New commits: commit 3f05aa8c1ea017a2aee627c2a5327ff9d5384449 Author: Matthias Seidel <msei...@apache.org> Date: Tue Mar 27 20:24:08 2018 +0000 Also copy config.sub before building dmake diff --git a/bootstrap.1 b/bootstrap.1 index 7ef41bb8af76..822f286416eb 100644 --- a/bootstrap.1 +++ b/bootstrap.1 @@ -113,7 +113,7 @@ if test -n "$DMAKE_URL" -a ! -x "$SOLARENV/$INPATH/bin/dmake$EXEEXT"; then echo "can not unpack the dmake source" dmake_directory_name= exit 1 - ;; + ;; esac echo "entering $dmake_directory_name" @@ -136,14 +136,15 @@ if test -n "$DMAKE_URL" -a ! -x "$SOLARENV/$INPATH/bin/dmake$EXEEXT"; then $GNUMAKE distclean || exit fi - # The config.guess for dmake is too old, overwrite it with ours: + # config.guess and config.sub for dmake are too old, overwrite with ours: cp $SOLARSRC/config.guess . + cp $SOLARSRC/config.sub . # We also need to patch dmake for Win64 patch -p0 < $SOLARSRC/solenv/src/dmake-cygwin64.patch ./configure $DMAKE_CONF || exit - + ## invoke the gnu make command set by configure. $GNUMAKE || exit @@ -154,7 +155,7 @@ if test -n "$DMAKE_URL" -a ! -x "$SOLARENV/$INPATH/bin/dmake$EXEEXT"; then echo "dmake successfully built and copied to $SOLARENV/$INPATH/bin/dmake$EXEEXT" echo "" - # Clean up. Note that this is skipped when one of the exits is executed above. + # Clean up. Note that this is skipped when one of the exits is executed above. rm -rf "$tmp_build_dir" elif test "$IS_SYSTEM_DMAKE" = "YES"; then _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits