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 /solenv/gbuild | |
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 'solenv/gbuild')
-rw-r--r-- | solenv/gbuild/LinkTarget.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk index 98c88a74616b..6cd8719f91b7 100644 --- a/solenv/gbuild/LinkTarget.mk +++ b/solenv/gbuild/LinkTarget.mk @@ -1624,7 +1624,7 @@ endef # function to set it manually. This variant should be used if gb_LinkTarget_use_clang is used. # call gb_LinkTarget_set_clang_precompiled_header,linktarget,pchcxxfile,,linktargetmakefilename define gb_LinkTarget_set_clang_precompiled_header -$(call gb_LinkTarget_set_precompiled_header,$(1),$(2),$(3),$(4),$(CLANG_CXX)) +$(call gb_LinkTarget_set_precompiled_header,$(1),$(2),$(3),$(4),$(LO_CLANG_CXX)) endef @@ -1783,8 +1783,8 @@ endef # C/C++ files will be build with Clang (if possible) instead of the default compiler. # call gb_LinkTarget_use_clang,linktarget,,linktargetmakefilename define gb_LinkTarget_use_clang -$(call gb_LinkTarget_get_target,$(1)) : T_CC := $(CLANG_CC) -$(call gb_LinkTarget_get_target,$(1)) : T_CXX := $(CLANG_CXX) +$(call gb_LinkTarget_get_target,$(1)) : T_CC := $(LO_CLANG_CC) +$(call gb_LinkTarget_get_target,$(1)) : T_CXX := $(LO_CLANG_CXX) $(call gb_LinkTarget_get_target,$(1)) : T_USE_LD := $(or $(CLANG_USE_LD),$(USE_LD)) endef |