[lmi-commits] [lmi] odd/multiarch c248e15 1/2: Manually merge recent changes from trunk

[Greg Chicares]

branch: odd/multiarch
commit c248e15677bc3ce8bc6584a276a7a879b4941918
Author: Gregory W. Chicares <address@hidden>
Commit: Gregory W. Chicares <address@hidden>

    Manually merge recent changes from trunk
---
 install_msw.sh | 45 +++++++++++++++++++--------------------------
 1 file changed, 19 insertions(+), 26 deletions(-)

diff --git a/install_msw.sh b/install_msw.sh
index 666a012..843dc5f 100755
--- a/install_msw.sh
+++ b/install_msw.sh
@@ -185,9 +185,6 @@ mount
 md5sum "$0"
 find /cache_for_lmi/downloads -type f | xargs md5sum
 
-# Not needed with for-loop below:
-export LMI_HOST=${LMI_HOST:-"i686-w64-mingw32"}
-
 if [ "Cygwin" = "$platform" ]
 then
     # For Cygwin, install and use this msw-native compiler.
@@ -198,36 +195,32 @@ fi
 make $coefficiency --output-sync=recurse -f install_miscellanea.make clobber
 make $coefficiency --output-sync=recurse -f install_miscellanea.make
 
-# It seems like a good idea to build both 32- and 64-bit msw binaries,
-# at least until we abandon 32-bit builds altogether.
+# This for-loop can iterate over as many architectures as desired.
+export LMI_HOST
 for LMI_HOST in i686-w64-mingw32 x86_64-w64-mingw32
 do
+    make $coefficiency --output-sync=recurse -f install_libxml2_libxslt.make
 
-make $coefficiency --output-sync=recurse -f install_libxml2_libxslt.make
-
-./install_wx.sh
-
-./install_wxpdfdoc.sh
+    ./install_wx.sh
+    ./install_wxpdfdoc.sh
 
-find /cache_for_lmi/downloads -type f | xargs md5sum
+    find /cache_for_lmi/downloads -type f | xargs md5sum
 
-. ./set_arch.sh
+    . ./set_arch.sh
 
-make $coefficiency --output-sync=recurse wx_config_check
-make $coefficiency --output-sync=recurse show_flags
-make $coefficiency --output-sync=recurse clean
-make $coefficiency --output-sync=recurse install
-
-if [ "Cygwin" = "$platform" ]
-then
-    # No lmi binary should depend on any Cygwin library.
-
-    for z in /opt/lmi/"$LMI_HOST"/bin/*; \
-      do cmd /c "$CYGCHECK $z" 2>&1 | grep --silent cygwin \
-        && printf '\ncygcheck %s\n' "$z" && cmd /c "$CYGCHECK $z"; \
-      done
-fi
+    make $coefficiency --output-sync=recurse wx_config_check
+    make $coefficiency --output-sync=recurse show_flags
+    make $coefficiency --output-sync=recurse clean
+    make $coefficiency --output-sync=recurse install
 
+    if [ "Cygwin" = "$platform" ]
+    then
+        # No lmi binary should depend on any Cygwin library.
+        for z in /opt/lmi/"$LMI_HOST"/bin/*; \
+          do cmd /c "$CYGCHECK $z" 2>&1 | grep --silent cygwin \
+            && printf '\ncygcheck %s\n' "$z" && cmd /c "$CYGCHECK $z"; \
+          done
+    fi
 done
 
 # To regenerate authentication files: