[lmi-commits] [lmi] master 0c5f914 06/12: Install gcc in an architecture-dependent directory

[Greg Chicares]

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

    Install gcc in an architecture-dependent directory
    
    This change allows 32- and 64-bit MinGW-w64 gcc installations to coexist
    so that one can conveniently be tested against the other.
    
    The name of each subdirectory deliberately is not "mingw"--see:
      https://sourceforge.net/p/mingw/mailman/message/15864073/
---
 install_libxml2_libxslt.make | 2 +-
 install_mingw.make           | 2 +-
 install_msw.sh               | 2 +-
 install_wx.sh                | 2 +-
 install_wxpdfdoc.sh          | 2 +-
 msw_cygwin.make              | 2 +-
 test_schemata.sh             | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/install_libxml2_libxslt.make b/install_libxml2_libxslt.make
index a0eeb5e..714d93a 100644
--- a/install_libxml2_libxslt.make
+++ b/install_libxml2_libxslt.make
@@ -41,7 +41,7 @@ source_archives := $(addsuffix .tar.gz, $(libraries))
 host          := ftp://xmlsoft.org
 host_path     := libxml2
 
-mingw_dir     := /opt/lmi/mingw
+mingw_dir     := /opt/lmi/${LMI_COMPILER}_${LMI_TRIPLET}/gcc_msw
 
 LMI_COMPILER  ?= gcc
 LMI_TRIPLET   ?= i686-w64-mingw32
diff --git a/install_mingw.make b/install_mingw.make
index a903844..76ed966 100644
--- a/install_mingw.make
+++ b/install_mingw.make
@@ -42,7 +42,7 @@ file_list   = $($(version))
 #   https://sourceforge.net/p/mingw/mailman/message/15864075/
 #     [2005-01-17T18:15:26Z from Aaron W. LaFramboise]
 
-mingw_dir  := /opt/lmi/mingw
+mingw_dir  := /opt/lmi/${LMI_COMPILER}_${LMI_TRIPLET}/gcc_msw
 prefix     := $(mingw_dir)
 
 cache_dir  := /cache_for_lmi/downloads
diff --git a/install_msw.sh b/install_msw.sh
index 2a63e00..99b27d3 100755
--- a/install_msw.sh
+++ b/install_msw.sh
@@ -200,7 +200,7 @@ do
   if [ "Cygwin" = "$platform" ]
   then
     # For Cygwin, install and use this msw-native compiler.
-    mingw_dir=/opt/lmi/mingw
+    mingw_dir=/opt/lmi/${LMI_COMPILER}_${LMI_TRIPLET}/gcc_msw
     [ -d "$mingw_dir" ] && rm --force --recursive "$mingw_dir"
     make $coefficiency --output-sync=recurse -f install_mingw.make
   fi
diff --git a/install_wx.sh b/install_wx.sh
index 2b29c00..3bca441 100755
--- a/install_wx.sh
+++ b/install_wx.sh
@@ -46,7 +46,7 @@ LMI_TRIPLET=${LMI_TRIPLET:-"i686-w64-mingw32"}
 
 # Variables that normally should be left alone 
#################################
 
-mingw_dir=/opt/lmi/mingw
+mingw_dir=/opt/lmi/${LMI_COMPILER}_${LMI_TRIPLET}/gcc_msw
 
 prefix=/opt/lmi/local
 exec_prefix="$prefix/${LMI_COMPILER}_${LMI_TRIPLET}"
diff --git a/install_wxpdfdoc.sh b/install_wxpdfdoc.sh
index e43a5ff..7791499 100755
--- a/install_wxpdfdoc.sh
+++ b/install_wxpdfdoc.sh
@@ -46,7 +46,7 @@ LMI_TRIPLET=${LMI_TRIPLET:-"i686-w64-mingw32"}
 
 # Variables that normally should be left alone 
#################################
 
-mingw_dir=/opt/lmi/mingw
+mingw_dir=/opt/lmi/${LMI_COMPILER}_${LMI_TRIPLET}/gcc_msw
 
 prefix=/opt/lmi/local
 exec_prefix="$prefix/${LMI_COMPILER}_${LMI_TRIPLET}"
diff --git a/msw_cygwin.make b/msw_cygwin.make
index d03cf57..9c73930 100644
--- a/msw_cygwin.make
+++ b/msw_cygwin.make
@@ -54,7 +54,7 @@ system_root := /cygdrive/c
 # Full path to gcc binaries, slash-terminated if nonempty. Setting it
 # to an empty string finds gcc on $PATH instead.
 
-mingw_dir   := /opt/lmi/mingw
+mingw_dir   := /opt/lmi/${LMI_COMPILER}_${LMI_TRIPLET}/gcc_msw
 gcc_bin_dir := $(mingw_dir)/bin/
 
 # Oddly, MinGW-w64 provides prefixed versions of compilers, e.g.:
diff --git a/test_schemata.sh b/test_schemata.sh
index 0efd70f..bf71e7d 100755
--- a/test_schemata.sh
+++ b/test_schemata.sh
@@ -44,7 +44,7 @@ cp --preserve "$srcdir"/sort_cell_subelements.xsl .
 
 echo "  Test cell-subelement sorting."
 
-mingw_dir=/opt/lmi/mingw
+mingw_dir=/opt/lmi/${LMI_COMPILER}_${LMI_TRIPLET}/gcc_msw
 mingw_bin_dir="$mingw_dir"/bin
 PATH="$mingw_bin_dir:$PATH" xsltproc sort_cell_subelements.xsl sample.cns | tr 
--delete '\r' > sorted.cns
 PATH="$mingw_bin_dir:$PATH" xsltproc sort_cell_subelements.xsl sample.ill | tr 
--delete '\r' > sorted.ill