[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[lmi-commits] [lmi] master a6fb202 01/11: Replace literal "gcc" with $LM
From: |
Greg Chicares |
Subject: |
[lmi-commits] [lmi] master a6fb202 01/11: Replace literal "gcc" with $LMI_COMPILER |
Date: |
Wed, 8 May 2019 13:23:23 -0400 (EDT) |
branch: master
commit a6fb202baa67229fe5f27cb517a277864b509da5
Author: Gregory W. Chicares <address@hidden>
Commit: Gregory W. Chicares <address@hidden>
Replace literal "gcc" with $LMI_COMPILER
To allow building with a different compiler, this change seems
necessary, though not sufficient--see:
https://lists.nongnu.org/archive/html/lmi/2019-05/msg00012.html
https://lists.nongnu.org/archive/html/lmi/2019-05/msg00014.html
---
install_wx.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/install_wx.sh b/install_wx.sh
index 294da80..ab8f54b 100755
--- a/install_wx.sh
+++ b/install_wx.sh
@@ -89,7 +89,7 @@ case "$build_type" in
esac
# Distinguish wx dll by host type, compiler version, and wx SHA1.
-gcc_version=$(${mingw_bin_dir}${LMI_TRIPLET}-gcc -dumpversion|tr -d '\r')
+gcc_version=$(${mingw_bin_dir}${LMI_TRIPLET}-$LMI_COMPILER -dumpversion|tr -d
'\r')
vendor=${LMI_TRIPLET}-$gcc_version-$wx_commit_sha
# Configuration reference:
@@ -135,7 +135,7 @@ config_options="
[ -n "$mingw_bin_dir" ] && export PATH="$mingw_bin_dir:${PATH}"
-build_dir="$prefix"/../wx-ad_hoc/lmi-gcc-$gcc_version
+build_dir="$prefix"/../wx-ad_hoc/lmi-$LMI_COMPILER-$gcc_version
if [ "$wx_skip_clean" != 1 ]
then
- [lmi-commits] [lmi] master updated (caf6f55 -> 42d072d), Greg Chicares, 2019/05/08
- [lmi-commits] [lmi] master db13831 02/11: Copy a directory's contents instead of the directory as such, Greg Chicares, 2019/05/08
- [lmi-commits] [lmi] master 081657d 06/11: Update to a working URL for msw md5sum binary, Greg Chicares, 2019/05/08
- [lmi-commits] [lmi] master 2817a1b 07/11: Make sure data directory exists before writing to it, Greg Chicares, 2019/05/08
- [lmi-commits] [lmi] master c4e2286 03/11: No longer treat pthread DLL as a compiler runtime file, Greg Chicares, 2019/05/08
- [lmi-commits] [lmi] master d8c273d 09/11: Let xsltproc be found (by cygwin), Greg Chicares, 2019/05/08
- [lmi-commits] [lmi] master a6fb202 01/11: Replace literal "gcc" with $LMI_COMPILER,
Greg Chicares <=
- [lmi-commits] [lmi] master 785ff4e 08/11: Remove undesirable quotes in scripts, Greg Chicares, 2019/05/08
- [lmi-commits] [lmi] master aee9f4d 10/11: For cygwin, add msw system directory to minimal path, Greg Chicares, 2019/05/08
- [lmi-commits] [lmi] master 6107ab7 05/11: Expunge liblzma, Greg Chicares, 2019/05/08
- [lmi-commits] [lmi] master 09eae7d 04/11: Distinguish $exec_prefix from $prefix, Greg Chicares, 2019/05/08
- [lmi-commits] [lmi] master 42d072d 11/11: Improve shell quoting, Greg Chicares, 2019/05/08