diff options
author | Luboš Luňák <l.lunak@collabora.com> | 2019-05-13 15:14:31 +0200 |
---|---|---|
committer | Luboš Luňák <l.lunak@collabora.com> | 2019-05-22 14:20:01 +0200 |
commit | caaffb213a0da5541ff9172e3f1600ce6447689c (patch) | |
tree | e3b6d9b22bdd866987e8f8d0df95aa60bf3ef316 /solenv/gbuild | |
parent | 96392d5c5319b0d6d3e8b07e78a199bf4b44a5ba (diff) |
use full path for -include .gch
With just -include a.hxx ccache checks only for presence of a.hxx.gch
and it doesn't search the path given by -I, so it didn't detect the usage
of the .gch and thus didn't include it in the checksum, possibly leading
to false positives. Icecream similarly doesn't search paths given by -I
and may fail to properly handle the .gch usage.
Change-Id: I40ba2d5089e77cd5e8da670c7e030f9e90ebc8ac
Reviewed-on: https://gerrit.libreoffice.org/72703
Tested-by: Jenkins
Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
Diffstat (limited to 'solenv/gbuild')
-rw-r--r-- | solenv/gbuild/platform/com_GCC_class.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/solenv/gbuild/platform/com_GCC_class.mk b/solenv/gbuild/platform/com_GCC_class.mk index 8ece06fd66f0..b9f9e3ea62aa 100644 --- a/solenv/gbuild/platform/com_GCC_class.mk +++ b/solenv/gbuild/platform/com_GCC_class.mk @@ -82,8 +82,8 @@ ifeq ($(COM_IS_CLANG),TRUE) gb_PrecompiledHeader_get_enableflags = -include-pch $(call gb_PrecompiledHeader_get_target,$(1),$(2)) gb_PrecompiledHeader_EXT := .pch else -gb_PrecompiledHeader_get_enableflags = -include $(notdir $(subst .gch,,$(call gb_PrecompiledHeader_get_target,$(1),$(2)))) \ - -I $(dir $(call gb_PrecompiledHeader_get_target,$(1),$(2))) +gb_PrecompiledHeader_get_enableflags = \ +-include $(dir $(call gb_PrecompiledHeader_get_target,$(1),$(2)))$(notdir $(subst .gch,,$(call gb_PrecompiledHeader_get_target,$(1),$(2)))) gb_PrecompiledHeader_EXT := .gch endif |