[lmi-commits] [lmi] master 8e066e7 07/10: Find gcc toolchain in a host-specific cygwin subdirectory

[Greg Chicares]

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

    Find gcc toolchain in a host-specific cygwin subdirectory
    
    See [reformatted to fit conventional git log width]:
      https://lists.nongnu.org/archive/html/lmi/2019-04/msg00060.html
    | it does seem like the compiler is expected to be in /MinGW_/bin
    | and not some other directory. Although this might need to be
    | changed in the light of above, i.e. maybe we should rather use
    | /MinGW_/mingw{32,64}/bin/gcc.exe instead.
    
    A happy accident led to the insight that 32- and 64-bit compilers can
    coexist in a single cygwin installation. For the time being, only a
    32-bit compiler is actually installed.
---
 msw_cygwin.make | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/msw_cygwin.make b/msw_cygwin.make
index 0caf4f1..e4cc042 100644
--- a/msw_cygwin.make
+++ b/msw_cygwin.make
@@ -54,7 +54,13 @@ system_root := /cygdrive/c
 # Full path to gcc binaries, slash-terminated if nonempty. Setting it
 # to an empty string finds gcc on $PATH instead.
 
-gcc_bin_dir := /MinGW_/bin/
+ifeq (i686-w64-mingw32,$(LMI_TRIPLET))
+  gcc_bin_dir := /MinGW_/mingw32/bin/
+else ifeq (x86_64-w64-mingw32,$(LMI_TRIPLET))
+  gcc_bin_dir := /MinGW_/mingw64/bin/
+else
+  $(warning Unexpected triplet '$(LMI_TRIPLET)')
+endif
 
 # Oddly, MinGW-w64 provides prefixed versions of compilers, e.g.:
 #   i686-w64-mingw32-gcc.exe