[lmi-commits] [lmi] master 396441f 13/30: Use gcc_version value from the environment, if any, in scripts

[Greg Chicares]

branch: master
commit 396441fc3685f137a6e6e92b1c05aff2001c5a6f
Author: Vadim Zeitlin <vadim@tt-solutions.com>
Commit: Gregory W. Chicares <gchicares@sbcglobal.net>

    Use gcc_version value from the environment, if any, in scripts
    
    This is especially useful when using compiler different from gcc (e.g.
    clang), as "make show_gcc_version" fails in this case currently.
---
 install_wx.sh       | 4 +++-
 install_wxpdfdoc.sh | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/install_wx.sh b/install_wx.sh
index e587fda..3477640 100755
--- a/install_wx.sh
+++ b/install_wx.sh
@@ -55,7 +55,9 @@ case "$build_type" in
 esac
 
 # Distinguish wx dll by host type, compiler version, and wx SHA1.
-gcc_version=$(make --no-print-directory --directory="$srcdir" show_gcc_version)
+if [ -z "$gcc_version" ]; then
+    gcc_version=$(make --no-print-directory --directory="$srcdir" 
show_gcc_version)
+fi
 vendor=${LMI_TRIPLET}-$gcc_version-$(git rev-parse --short HEAD:third_party/wx)
 
 # Configuration reference:
diff --git a/install_wxpdfdoc.sh b/install_wxpdfdoc.sh
index 3244193..8bdb2ea 100755
--- a/install_wxpdfdoc.sh
+++ b/install_wxpdfdoc.sh
@@ -85,7 +85,9 @@ fi
 cd "$wxpdfdoc_dir"
 autoreconf --verbose
 
-gcc_version=$(make --no-print-directory --directory="$srcdir" show_gcc_version)
+if [ -z "$gcc_version" ]; then
+    gcc_version=$(make --no-print-directory --directory="$srcdir" 
show_gcc_version)
+fi
 build_dir="$exec_prefix/wxpdfdoc-ad_hoc/lmi-$LMI_COMPILER-$gcc_version"
 
 if [ "$wxpdfdoc_skip_clean" != 1 ]