diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2020-10-15 18:38:24 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2020-10-16 11:21:27 +0200 |
| commit | 5b0ca23615c3d0aae7083147bc3bb5d61db26f5e (patch) | |
| tree | be4599ea9efb29aadc7e51ce05490fd875a2183c /external/libpng | |
| parent | 87c90cec38c43efbbd9cbfad1f0f607f428043d4 (diff) | |
Rename CLANG_CC, CLANG_CXX configuration vars (avoid clash with scan-build)
Clang's scan-build tool uses the CLANG_CXX environment variable (setting it up
in the scan-build script to pass it to the ccc-analyzer script), but happens to
erroneously set it to a non-existing path (see <https://reviews.llvm.org/D89481>
"[scan-build] Fix clang++ pathname again"). So wrapping LO's autogen.sh and
make in scan-build picked up that broken CLANG_CXX and caused build
failures like
> [CXX] external/skia/source/SkMemory_malloc.cxx
> /bin/sh: ~/llvm/inst/bin/clang-12++: No such file or directory
(see
<https://lists.freedesktop.org/archives/libreoffice/2020-October/086113.html>
"Re: llvm/clang static analyzer reports").
So rename CLANG_CXX, and for consistency also CLANG_CC and the various
CLANG_CXXFLAGS_INTRINSICS_*, by prefixing each with LO_.
Change-Id: Ib41cabe940f8bfb1997f74e865cca5725f859e07
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104383
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'external/libpng')
| -rw-r--r-- | external/libpng/StaticLibrary_libpng.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/external/libpng/StaticLibrary_libpng.mk b/external/libpng/StaticLibrary_libpng.mk index 8abfdec063db..77f1b29dc00a 100644 --- a/external/libpng/StaticLibrary_libpng.mk +++ b/external/libpng/StaticLibrary_libpng.mk @@ -46,14 +46,14 @@ $(eval $(call gb_StaticLibrary_add_generated_cobjects,libpng,\ # At least on Linux, with --enable-lto, when building both this external/libpng and external/skia, # and building with GCC but building skia with Clang (which should be the sole combination that -# matches "CLANG_CC is non-empty"), build this as a fat archive (including both the intermediate GCC +# matches "LO_CLANG_CC is non-empty"), build this as a fat archive (including both the intermediate GCC # object code for LTO and machine object code). Besides targets like Library_vcl (which benefit # from the intermediate GCC object code for LTO), also Library_skia (built with the Clang toolchain # lld, which does not understand intermediate GCC object code) includes this, so would otherwise # fail to link (but now does not benefit from LTO for this included StaticLibrary_libpng): ifeq ($(OS)-$(ENABLE_LTO),LINUX-TRUE) ifneq ($(filter SKIA,$(BUILD_TYPE)),) -ifneq ($(CLANG_CC),) +ifneq ($(LO_CLANG_CC),) $(eval $(call gb_StaticLibrary_add_cflags,libpng,-ffat-lto-objects)) endif endif |