lmi-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[lmi-commits] [lmi] master 502a7d2 05/12: Install MinGW gcc after LMI_*


From: Greg Chicares
Subject: [lmi-commits] [lmi] master 502a7d2 05/12: Install MinGW gcc after LMI_* environment variables have been set
Date: Sun, 12 May 2019 22:25:16 -0400 (EDT)

branch: master
commit 502a7d2886d233808df040312c2362e23919c8eb
Author: Gregory W. Chicares <address@hidden>
Commit: Gregory W. Chicares <address@hidden>

    Install MinGW gcc after LMI_* environment variables have been set
    
    Rationale: the compiler is architecture dependent.
---
 install_msw.sh | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/install_msw.sh b/install_msw.sh
index d3f80d2..2a63e00 100755
--- a/install_msw.sh
+++ b/install_msw.sh
@@ -186,14 +186,6 @@ mount
 md5sum "$0"
 find /cache_for_lmi/downloads -type f | xargs md5sum
 
-if [ "Cygwin" = "$platform" ]
-then
-    # For Cygwin, install and use this msw-native compiler.
-    mingw_dir=/opt/lmi/mingw
-    [ -d "$mingw_dir" ] && rm --force --recursive "$mingw_dir"
-    make $coefficiency --output-sync=recurse -f install_mingw.make
-fi
-
 make $coefficiency --output-sync=recurse -f install_miscellanea.make clobber
 make $coefficiency --output-sync=recurse -f install_miscellanea.make
 
@@ -205,6 +197,14 @@ export LMI_TRIPLET
 #for LMI_TRIPLET in x86_64-w64-mingw32 i686-w64-mingw32 ;
 for LMI_TRIPLET in i686-w64-mingw32 ;
 do
+  if [ "Cygwin" = "$platform" ]
+  then
+    # For Cygwin, install and use this msw-native compiler.
+    mingw_dir=/opt/lmi/mingw
+    [ -d "$mingw_dir" ] && rm --force --recursive "$mingw_dir"
+    make $coefficiency --output-sync=recurse -f install_mingw.make
+  fi
+
     make $coefficiency --output-sync=recurse -f install_libxml2_libxslt.make
 
     ./install_wx.sh



reply via email to

[Prev in Thread] Current Thread [Next in Thread]