[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[lmi-commits] [lmi] master 193e0a9 1/2: Upgrade to gcc-7.2
From: |
Greg Chicares |
Subject: |
[lmi-commits] [lmi] master 193e0a9 1/2: Upgrade to gcc-7.2 |
Date: |
Sat, 3 Mar 2018 19:40:31 -0500 (EST) |
branch: master
commit 193e0a90691648305658cc53a9b91d37840dbe49
Author: Gregory W. Chicares <address@hidden>
Commit: Gregory W. Chicares <address@hidden>
Upgrade to gcc-7.2
These changes are modelled on:
commit 1ab78e78a430b2ede71ffe2ace4f3772e8169bfd
commit 26b625b5b0f59614dc394f4ad69c9f4e16728c70
---
install_cygwin.bat | 2 +-
install_mingw.make | 4 +++-
install_msw.sh | 4 ++--
3 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/install_cygwin.bat b/install_cygwin.bat
index e6ae7a7..6654ff0 100644
--- a/install_cygwin.bat
+++ b/install_cygwin.bat
@@ -35,7 +35,7 @@ START "Installing Cygwin" /WAIT setup-x86 ^
bsdtar,cvs,dos2unix,doxygen,gdb,git,git-cvs,git-svn,libtool,make,openssh,patch,rsync,subversion,unzip,wget,zip,zsh
cd C:\cygwin-lmi\etc
echo # >> fstab
-echo C:/opt/lmi/MinGW-6_3_0 /MinGW_ lmi_specific binary,user 0 0 >>
fstab
+echo C:/opt/lmi/MinGW-7_2_0 /MinGW_ lmi_specific binary,user 0 0 >>
fstab
echo C:/opt/lmi /opt/lmi lmi_specific binary,user 0 0 >>
fstab
echo C:/lmi /lmi lmi_specific binary,user 0 0 >>
fstab
echo C:/cache_for_lmi /cache_for_lmi lmi_specific binary,user 0 0 >>
fstab
diff --git a/install_mingw.make b/install_mingw.make
index 3a9116f..e190e23 100644
--- a/install_mingw.make
+++ b/install_mingw.make
@@ -28,7 +28,7 @@ this_makefile := $(abspath $(lastword $(MAKEFILE_LIST)))
# rather than release its own; lmi uses i686 builds with native
# threads and SJLJ exceptions.
-version := MinGW-6_3_0
+version := MinGW-7_2_0
file_list = $($(version))
@@ -56,11 +56,13 @@ mirror := http://downloads.sourceforge.net/mingw-w64
#MinGW-6_3_0 := i686-6.3.0-release-win32-sjlj-rt_v5-rev1.7z
MinGW-6_3_0 := i686-6.3.0-release-win32-sjlj-rt_v5-rev2.7z
+MinGW-7_2_0 := i686-7.2.0-release-win32-sjlj-rt_v5-rev0.7z
# Archive md5sums
##############################################################
#$(MinGW-6_3_0)-md5 := b92e8480cf8d5904da78ab6d94f1a047
$(MinGW-6_3_0)-md5 := 6e15de993400279c24b40b1f978e9380
+$(MinGW-7_2_0)-md5 := f34ff6eca4aa7a645f60c977b107c5d2
# Utilities
####################################################################
diff --git a/install_msw.sh b/install_msw.sh
index 5d52e29..c8232fd 100755
--- a/install_msw.sh
+++ b/install_msw.sh
@@ -144,9 +144,9 @@ then
restore_MinGW_mount=`mount --mount-entries | grep '/MinGW_ '`
[ -z "$restore_MinGW_mount" ] \
- || printf "$restore_MinGW_mount\n" | grep --silent
'C:/opt/lmi/MinGW-6_3_0' \
+ || printf "$restore_MinGW_mount\n" | grep --silent
'C:/opt/lmi/MinGW-7_2_0' \
|| printf "Replacing former MinGW_ mount:\n $restore_MinGW_mount\n"
>/dev/tty
- mount --force "C:/opt/lmi/MinGW-6_3_0" "/MinGW_"
+ mount --force "C:/opt/lmi/MinGW-7_2_0" "/MinGW_"
restore_cache_mount=`mount --mount-entries | grep '/cache_for_lmi '`
[ -z "$restore_cache_mount" ] \