lmi-commits
[Top][All Lists]
Advanced

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

[lmi-commits] [lmi] master 264f653: Revert "Upgrade to gcc-8.x"


From: Greg Chicares
Subject: [lmi-commits] [lmi] master 264f653: Revert "Upgrade to gcc-8.x"
Date: Thu, 2 May 2019 08:50:58 -0400 (EDT)

branch: master
commit 264f6537beba7ca4940b16b59836b86fc8a5373b
Author: Gregory W. Chicares <address@hidden>
Commit: Gregory W. Chicares <address@hidden>

    Revert "Upgrade to gcc-8.x"
    
    This reverts commit 74fe75e21513cdde35d302845cb104bf509da46f.
---
 install_cygwin.bat | 2 +-
 install_mingw.make | 4 +---
 install_msw.sh     | 4 ++--
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/install_cygwin.bat b/install_cygwin.bat
index 7b32e1e..ecd1254 100644
--- a/install_cygwin.bat
+++ b/install_cygwin.bat
@@ -35,7 +35,7 @@ START "Installing Cygwin" /WAIT setup-x86_64 ^
    
"autoconf,automake,bsdtar,dos2unix,doxygen,gdb,git,libtool,make,openssh,patch,pkg-config,rsync,unzip,wget,zip,zsh"
 cd C:\cygwin64_lmi\etc
 echo # >> fstab
-echo C:/opt/lmi/MinGW-8_1_0 /MinGW_        lmi_specific binary,user 0 0 >> 
fstab
+echo C:/opt/lmi/MinGW-7_3_0 /MinGW_        lmi_specific binary,user 0 0 >> 
fstab
 echo C:/opt/lmi             /opt/lmi       lmi_specific binary,user 0 0 >> 
fstab
 echo C:/cache_for_lmi       /cache_for_lmi lmi_specific binary,user 0 0 >> 
fstab
 echo Cygwin installation seems to have succeeded
diff --git a/install_mingw.make b/install_mingw.make
index eb28c0b..4f5f1ea 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-8_1_0
+version   := MinGW-7_3_0
 
 file_list   = $($(version))
 
@@ -60,7 +60,6 @@ mirror     := http://downloads.sourceforge.net/mingw-w64
 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
 MinGW-7_3_0 := i686-7.3.0-release-win32-sjlj-rt_v5-rev0.7z
-MinGW-8_1_0 := i686-8.1.0-release-win32-sjlj-rt_v6-rev0.7z
 
 # Archive md5sums 
##############################################################
 
@@ -68,7 +67,6 @@ MinGW-8_1_0 := i686-8.1.0-release-win32-sjlj-rt_v6-rev0.7z
 $(MinGW-6_3_0)-md5 := 6e15de993400279c24b40b1f978e9380
 $(MinGW-7_2_0)-md5 := f34ff6eca4aa7a645f60c977b107c5d2
 $(MinGW-7_3_0)-md5 := 37d964d08ce48dc170cc95a84679cc4f
-$(MinGW-8_1_0)-md5 := 28ec1e65ab85a9e1043998516045ab62
 
 # Utilities 
####################################################################
 
diff --git a/install_msw.sh b/install_msw.sh
index 9fa7d8b..5463f67 100755
--- a/install_msw.sh
+++ b/install_msw.sh
@@ -163,9 +163,9 @@ then
 
     restore_MinGW_mount=$(mount --mount-entries | grep '/MinGW_ ')
     [ -z "$restore_MinGW_mount" ] \
-      || printf '%s\n' "$restore_MinGW_mount" | grep --silent 
'C:/opt/lmi/MinGW-8_1_0' \
+      || printf '%s\n' "$restore_MinGW_mount" | grep --silent 
'C:/opt/lmi/MinGW-7_3_0' \
       || printf 'Replacing former MinGW_ mount:\n %s\n' "$restore_MinGW_mount" 
>/dev/tty
-    mount --force "C:/opt/lmi/MinGW-8_1_0" "/MinGW_"
+    mount --force "C:/opt/lmi/MinGW-7_3_0" "/MinGW_"
 
     restore_cache_mount=$(mount --mount-entries | grep '/cache_for_lmi ')
     [ -z "$restore_cache_mount" ] \



reply via email to

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