diff options
author | Matthias Seidel <mseidel@apache.org> | 2018-03-27 20:24:08 +0000 |
---|---|---|
committer | Matthias Seidel <mseidel@apache.org> | 2018-03-27 20:24:08 +0000 |
commit | 3f05aa8c1ea017a2aee627c2a5327ff9d5384449 (patch) | |
tree | 4d08e7e9a66f3de3a55b4c051bb37a3187346380 | |
parent | 6176f177905984d9a2de23714d700b19a427c175 (diff) |
Also copy config.sub before building dmake
Notes
Notes:
ignore: obsolete
-rw-r--r-- | bootstrap.1 | 9 |
1 files changed, 5 insertions, 4 deletions
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 |