lmi-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[lmi-commits] [lmi] odd/fixups 45e7da7 1/4: Replace literal "gcc" with $


From: Greg Chicares
Subject: [lmi-commits] [lmi] odd/fixups 45e7da7 1/4: Replace literal "gcc" with $LMI_COMPILER
Date: Mon, 6 May 2019 19:06:58 -0400 (EDT)

branch: odd/fixups
commit 45e7da7a2560f6c2e5642354bbd2e1e9ef8754b2
Author: Gregory W. Chicares <address@hidden>
Commit: Gregory W. Chicares <address@hidden>

    Replace literal "gcc" with $LMI_COMPILER
    
    This change seems necessary to allow building with a different compiler.
---
 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



reply via email to

[Prev in Thread] Current Thread [Next in Thread]