[Top][All Lists]

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

[lmi-commits] [lmi] master 866ff71: Ascertain gcc version even more reli

From: Greg Chicares
Subject: [lmi-commits] [lmi] master 866ff71: Ascertain gcc version even more reliably
Date: Sat, 10 Oct 2020 08:53:17 -0400 (EDT)

branch: master
commit 866ff71dc14cdde38e145231a6dd0f58097c9cad
Author: Gregory W. Chicares <gchicares@sbcglobal.net>
Commit: Gregory W. Chicares <gchicares@sbcglobal.net>

    Ascertain gcc version even more reliably
    Specifying '--directory=' automatically enables '--print-directory',
    which isn't wanted here.
 install_wx.sh       | 2 +-
 install_wxpdfdoc.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/install_wx.sh b/install_wx.sh
index b668b5e..27d17a2 100755
--- a/install_wx.sh
+++ b/install_wx.sh
@@ -55,7 +55,7 @@ case "$build_type" in
 # Distinguish wx dll by host type, compiler version, and wx SHA1.
-gcc_version=$(make show_gcc_version)
+gcc_version=$(make --no-print-directory --directory="$srcdir" show_gcc_version)
 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 4dd778f..c3a11a0 100755
--- a/install_wxpdfdoc.sh
+++ b/install_wxpdfdoc.sh
@@ -72,7 +72,7 @@ config_options="
 cd "$wxpdfdoc_dir"
 autoreconf --verbose
-gcc_version=$(make show_gcc_version)
+gcc_version=$(make --no-print-directory --directory="$srcdir" show_gcc_version)
 if [ "$wxpdfdoc_skip_clean" != 1 ]

reply via email to

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