[lmi-commits] [lmi] master a6fb202 01/11: Replace literal "gcc" with $LMI_COMPILER

[Greg Chicares]

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