From fd5504e2adf3831f8fbc1da7357f58d86862053b Mon Sep 17 00:00:00 2001 From: Geert Janssens Date: Wed, 21 Dec 2011 17:43:48 +0000 Subject: [PATCH] win32 build: indicate when dist.sh begins or ends and remove redundant crosscompile check git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@21771 57a11ea4-9604-0410-9ed3-97b8803252fd --- packaging/win32/dist.sh | 6 ++++++ packaging/win32/install-impl.sh | 1 - 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/packaging/win32/dist.sh b/packaging/win32/dist.sh index 986181d57f..7253826c18 100755 --- a/packaging/win32/dist.sh +++ b/packaging/win32/dist.sh @@ -8,6 +8,9 @@ function on_error() { } trap on_error ERR +echo -n "Build (dist) Starting at " +date + function qpushd() { pushd "$@" >/dev/null; } function qpopd() { popd >/dev/null; } function unix_path() { echo "$*" | sed 's,^\([A-Za-z]\):,/\1,;s,\\,/,g'; } @@ -55,6 +58,9 @@ restore_msys "$_PID" qpopd +echo -n "Build (dist) Finished at " +date + ### Local Variables: *** ### sh-basic-offset: 4 *** ### indent-tabs-mode: nil *** diff --git a/packaging/win32/install-impl.sh b/packaging/win32/install-impl.sh index d58b0cd2ef..6b9b1c116e 100644 --- a/packaging/win32/install-impl.sh +++ b/packaging/win32/install-impl.sh @@ -148,7 +148,6 @@ function inst_mingw() { _MINGW_WFSDIR=`win_fs_path $MINGW_DIR` # Configure msys to use mingw on the above path before running any tests ! configure_msys "$_PID" "$_MINGW_WFSDIR" - [ "$CROSS_COMPILE" = "yes" ] && add_to_env $_MINGW_UDIR/bin PATH add_to_env $_MINGW_UDIR/bin PATH if quiet test_for_mingw