[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
- [lmi-commits] [lmi] master updated (fe191f3 -> 46d19dd), Greg Chicares, 2019/05/12
- [lmi-commits] [lmi] master d3d3147 04/12: Use MinGW directory only as a variable, never as a literal, Greg Chicares, 2019/05/12
- [lmi-commits] [lmi] master f9b8091 09/12: Resolve all shellcheck "SC2003" warnings, Greg Chicares, 2019/05/12
- [lmi-commits] [lmi] master 2c95b12 08/12: Resolve all shellcheck "SC2046" warnings, Greg Chicares, 2019/05/12
- [lmi-commits] [lmi] master 502a7d2 05/12: Install MinGW gcc after LMI_* environment variables have been set,
Greg Chicares <=
- [lmi-commits] [lmi] master b53fd90 07/12: Suppress misleading shellcheck diagnostics, Greg Chicares, 2019/05/12
- [lmi-commits] [lmi] master 66ae5a6 03/12: Clarify that obsolete makefiles needn't be maintained, Greg Chicares, 2019/05/12
- [lmi-commits] [lmi] master d5123bd 02/12: Replace some dead gmane URLs, Greg Chicares, 2019/05/12
- [lmi-commits] [lmi] master e91fdeb 10/12: Resolve all shellcheck "SC1117" warnings, Greg Chicares, 2019/05/12
- [lmi-commits] [lmi] master 0c5f914 06/12: Install gcc in an architecture-dependent directory, Greg Chicares, 2019/05/12
- [lmi-commits] [lmi] master 46d19dd 12/12: Resolve all shellcheck "SC2043" warnings, Greg Chicares, 2019/05/12
- [lmi-commits] [lmi] master ca39972 01/12: Remove outdated cross-compiling instructions, Greg Chicares, 2019/05/12
- [lmi-commits] [lmi] master 325dc9f 11/12: Resolve all shellcheck "SC2129" warnings, Greg Chicares, 2019/05/12