[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[lmi-commits] [lmi] master 8e066e7 07/10: Find gcc toolchain in a host-s
From: |
Greg Chicares |
Subject: |
[lmi-commits] [lmi] master 8e066e7 07/10: Find gcc toolchain in a host-specific cygwin subdirectory |
Date: |
Tue, 30 Apr 2019 22:17:56 -0400 (EDT) |
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
- [lmi-commits] [lmi] master updated (f4c8594 -> 4e41753), Greg Chicares, 2019/04/30
- [lmi-commits] [lmi] master f4a0a79 02/10: Expunge a silly line, Greg Chicares, 2019/04/30
- [lmi-commits] [lmi] master bef5fc1 04/10: Rename a variable for concinnity, Greg Chicares, 2019/04/30
- [lmi-commits] [lmi] master 60efb0a 06/10: Improve documentation, Greg Chicares, 2019/04/30
- [lmi-commits] [lmi] master 44271d3 01/10: Add '--no-verbose' flag to wget options, Greg Chicares, 2019/04/30
- [lmi-commits] [lmi] master e653dbd 03/10: Refactor: transplant two recipe lines, Greg Chicares, 2019/04/30
- [lmi-commits] [lmi] master 44b05c9 05/10: Replace literal triplets with $(LMI_TRIPLET) where appropriate, Greg Chicares, 2019/04/30
- [lmi-commits] [lmi] master 8e066e7 07/10: Find gcc toolchain in a host-specific cygwin subdirectory,
Greg Chicares <=
- [lmi-commits] [lmi] master ac53148 08/10: Build only 32-bit binaries for now, Greg Chicares, 2019/04/30
- [lmi-commits] [lmi] master 445e647 09/10: Remove a '--verbose' flag that was once useful for debugging, Greg Chicares, 2019/04/30
- [lmi-commits] [lmi] master 4e41753 10/10: Don't eviscerate $(bindir), Greg Chicares, 2019/04/30