diff options
| author | Sam James <sam@gentoo.org> | 2023-01-13 15:09:59 +0000 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2023-01-14 11:55:29 +0000 |
| commit | d532040f3e9f11e4f364e0313e426cdb708e6568 (patch) | |
| tree | 133d0383e75efe796f9f72372779f42e0431b251 /configure.ac | |
| parent | 192b0ab41e87f3c4aaf78f22b96b030243c991d5 (diff) | |
configure.ac: Fix build with --with-system-zxing and < Clang 16
Clang 15 and older default to -std=c++14, not -std=c++17 (unlike Clang 16 onwards).
This doesn't show up with GCC because GCC 11 onwards defaults to -std=c++17.
The new version of libzxing requires C++ 17, per its release notes. Adapt
the configure check accordingly to pass -std=c++17 when checking for its
headers and save accordingly if successful.
(Do this via ${CXXFLAGS_CXX11} which has the appropriate switch
for our compiler, despite its name.)
Bug: https://bugs.gentoo.org/890324
Change-Id: Iaaa8fdc05eea0e26416b605bfda8f2d831f8729c
Signed-off-by: Sam James <sam@gentoo.org>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145479
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index 56119241c743..47b6702df669 100644 --- a/configure.ac +++ b/configure.ac @@ -11187,7 +11187,7 @@ else continue fi dnl TODO: White space in $i would cause problems: - CXXFLAGS="$save_CXXFLAGS -I$i/ZXing" + CXXFLAGS="$save_CXXFLAGS ${CXXFLAGS_CXX11} -I$i/ZXing" AC_CHECK_HEADER(MultiFormatWriter.h, [ZXING_CFLAGS=-I$i/ZXing; break], [unset ac_cv_header_MultiFormatWriter_h], [#include <stdexcept>]) done |