lmi-commits
[Top][All Lists]
Advanced

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

[lmi-commits] [lmi] master 16f5385: Install msw-native gcc iff required


From: Greg Chicares
Subject: [lmi-commits] [lmi] master 16f5385: Install msw-native gcc iff required
Date: Fri, 5 Nov 2021 10:27:12 -0400 (EDT)

branch: master
commit 16f53851b4313bf68a890e015ee9594ea2bc716a
Author: Gregory W. Chicares <gchicares@sbcglobal.net>
Commit: Gregory W. Chicares <gchicares@sbcglobal.net>

    Install msw-native gcc iff required
---
 install_msw.sh | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/install_msw.sh b/install_msw.sh
index bcde29b..e7c9bde 100755
--- a/install_msw.sh
+++ b/install_msw.sh
@@ -282,16 +282,17 @@ do
     export PATH="$minimal_path"
 
     # For Cygwin or WSL, install and use this msw-native compiler.
-    # Install it for other build types, too, even if only for
-    # validating the installation procedure.
-    mingw_dir=/opt/lmi/${LMI_COMPILER}_${LMI_TRIPLET}/gcc_msw
-    [ -d "$mingw_dir" ] && rm --force --recursive "$mingw_dir"
-    if   [ "i686-w64-mingw32"   = "$LMI_TRIPLET" ]; then
-      make "$coefficiency" --output-sync=recurse -f install_mingw32.make
-    elif [ "x86_64-w64-mingw32" = "$LMI_TRIPLET" ]; then
-      make "$coefficiency" --output-sync=recurse -f install_mingw.make
-    else
-      printf 'No MinGW compiler for this triplet.\n'
+    if [ "Cygwin" = "$platform" ] || [ "WSL" = "$platform" ]
+    then
+        mingw_dir=/opt/lmi/${LMI_COMPILER}_${LMI_TRIPLET}/gcc_msw
+        [ -d "$mingw_dir" ] && rm --force --recursive "$mingw_dir"
+        if   [ "i686-w64-mingw32"   = "$LMI_TRIPLET" ]; then
+          make "$coefficiency" --output-sync=recurse -f install_mingw32.make
+        elif [ "x86_64-w64-mingw32" = "$LMI_TRIPLET" ]; then
+          make "$coefficiency" --output-sync=recurse -f install_mingw.make
+        else
+          printf 'No MinGW compiler for this triplet.\n'
+        fi
     fi
 
     ./install_xml_libraries.sh



reply via email to

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