From b4ebe560206340a9ef5b20299a675dac67070d11 Mon Sep 17 00:00:00 2001 From: Geert Janssens Date: Tue, 4 May 2010 22:40:19 +0000 Subject: [PATCH] Improve test_for_mingw - change test so that both tested programs must work, not only the exit code of the last one - make it cross-compile compatible git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@19101 57a11ea4-9604-0410-9ed3-97b8803252fd --- packaging/win32/install.sh | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/packaging/win32/install.sh b/packaging/win32/install.sh index bb969b7117..b726825729 100644 --- a/packaging/win32/install.sh +++ b/packaging/win32/install.sh @@ -142,11 +142,10 @@ function inst_dtk() { } function test_for_mingw() { - ${CC} --version - ${LD} --help - if [ "$CROSS_COMPILE" != "yes" ]; then - g++ --version - mingw32-make --help + if [ "$CROSS_COMPILE" == "yes" ]; then + ${CC} --version && ${LD} --help + else + g++ --version && mingw32-make --help fi }