[lmi-commits] [lmi] master fe191f3 7/7: Fully reflect earlier eradication of cygwin "MinGW_" mount

[Greg Chicares]

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

    Fully reflect earlier eradication of cygwin "MinGW_" mount
---
 bcc_5_5_1.make | 2 +-
 como.make      | 2 +-
 install_msw.sh | 8 +-------
 3 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/bcc_5_5_1.make b/bcc_5_5_1.make
index 2d0cf0b..a97707e 100644
--- a/bcc_5_5_1.make
+++ b/bcc_5_5_1.make
@@ -53,7 +53,7 @@ compiler_impersonation_cppflags := \
   -D WIN32_LEAN_AND_MEAN \
   -I $(shadow_header_directory) \
 
-gcc3_dir     := /MinGW_
+gcc3_dir     := /opt/lmi/mingw
 gcc3_bin_dir := $(gcc3_dir)/bin
 
 # Casual workarounds for borland C++ version 5.5.1 . The vendor calls
diff --git a/como.make b/como.make
index 8cc9463..af28df9 100644
--- a/como.make
+++ b/como.make
@@ -76,7 +76,7 @@ UNUSED_compiler_impersonation_cppflags := \
   -D LMI_IGNORE_PCH \
   -D __COMO__ \
 
-gcc3_dir     := /MinGW_
+gcc3_dir     := /opt/lmi/mingw
 gcc3_bin_dir := $(gcc3_dir)/bin
 
 # Comeau C++ for msw requires both its own bin/ directory and the
diff --git a/install_msw.sh b/install_msw.sh
index 4fc1547..160f7bd 100755
--- a/install_msw.sh
+++ b/install_msw.sh
@@ -168,12 +168,6 @@ then
     # It seems quite unlikely that anyone who's building lmi would have
     # any other need for mounts with the names used here.
 
-    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 'Replacing former MinGW_ mount:\n %s\n' "$restore_MinGW_mount" 
>/dev/tty
-    mount --force "C:/opt/lmi/MinGW-8_1_0" "/MinGW_"
-
     restore_cache_mount=$(mount --mount-entries | grep '/cache_for_lmi ')
     [ -z "$restore_cache_mount" ] \
       || printf '%s\n' "$restore_cache_mount" | grep --silent 
'C:/cache_for_lmi' \
@@ -195,7 +189,7 @@ find /cache_for_lmi/downloads -type f | xargs md5sum
 if [ "Cygwin" = "$platform" ]
 then
     # For Cygwin, install and use this msw-native compiler.
-    rm --force --recursive /MinGW_
+    rm --force --recursive /opt/lmi/mingw
     make $coefficiency --output-sync=recurse -f install_mingw.make
 fi