[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[lmi-commits] [lmi] master 396441f 13/30: Use gcc_version value from the
From: |
Greg Chicares |
Subject: |
[lmi-commits] [lmi] master 396441f 13/30: Use gcc_version value from the environment, if any, in scripts |
Date: |
Wed, 24 Mar 2021 15:31:08 -0400 (EDT) |
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 ]
- [lmi-commits] [lmi] master 41bd0a3 22/30: Update wx submodule to avoid clang warning in wx/hashmap.h, (continued)
- [lmi-commits] [lmi] master 41bd0a3 22/30: Update wx submodule to avoid clang warning in wx/hashmap.h, Greg Chicares, 2021/03/24
- [lmi-commits] [lmi] master 1f94454 25/30: Disable clang -Wstring-plus-int warning, Greg Chicares, 2021/03/24
- [lmi-commits] [lmi] master 12922c2 27/30: Generate product files in the CI builds using autotools too, Greg Chicares, 2021/03/24
- [lmi-commits] [lmi] master 80e1b14 23/30: Fix caching of wxWidgets and wxPdfDoc libraries, Greg Chicares, 2021/03/24
- [lmi-commits] [lmi] master f4a91e3 28/30: Move XSD and XSL copy command to a more appropriate CI job step, Greg Chicares, 2021/03/24
- [lmi-commits] [lmi] master 593a712 29/30: Actually update wx, Greg Chicares, 2021/03/24
- [lmi-commits] [lmi] master 0b85c14 30/30: Improve documentation, Greg Chicares, 2021/03/24
- [lmi-commits] [lmi] master b0ed5cc 07/30: Create required files in the build directory with autotools, Greg Chicares, 2021/03/24
- [lmi-commits] [lmi] master f5b317c 08/30: Don't skip path_utility_test unnecessarily in the CI builds, Greg Chicares, 2021/03/24
- [lmi-commits] [lmi] master ecd3435 11/30: Default to x86_64-pc-linux-gnu LMI_TRIPLET in the CI builds, Greg Chicares, 2021/03/24
- [lmi-commits] [lmi] master 396441f 13/30: Use gcc_version value from the environment, if any, in scripts,
Greg Chicares <=
- [lmi-commits] [lmi] master 91116f9 14/30: Suppress -Wdeprecated-copy in Boost headers for gcc9 too, Greg Chicares, 2021/03/24
- [lmi-commits] [lmi] master dd0b2a63 16/30: Work around problem with executable files under .git in CI builds, Greg Chicares, 2021/03/24
- [lmi-commits] [lmi] master 1c6ac28 04/30: Simplify test targets definitions in Automake makefile, Greg Chicares, 2021/03/24
- [lmi-commits] [lmi] master e859cc7 09/30: Test build using autotools in GitHub Actions CI workflow too, Greg Chicares, 2021/03/24
- [lmi-commits] [lmi] master fc0987e 18/30: Disable clang-specific warning when compiling Boost libraries, Greg Chicares, 2021/03/24
- [lmi-commits] [lmi] master 815b26b 21/30: Show config.log if running configure for XML libraries failed, Greg Chicares, 2021/03/24
- [lmi-commits] [lmi] master 2663129 24/30: Ignore more warnings in Boost.Regex headers with clang, Greg Chicares, 2021/03/24
- [lmi-commits] [lmi] master 9de81b8 26/30: Avoid -Wsometimes-uninitialized clang warning in a test, Greg Chicares, 2021/03/24