solenv/gbuild/PrecompiledHeaders.mk | 3 ++-
solenv/gbuild/platform/com_GCC_defs.mk | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
New commits:
commit f22e5078cfac93c50ae5169f65450918b34b0e99
Author: Luboš Luňák <l.lu...@collabora.com>
AuthorDate: Tue Nov 16 15:03:27 2021 +0100
Commit: Luboš Luňák <l.lu...@collabora.com>
CommitDate: Tue Nov 16 18:36:23 2021 +0100
do not rebuild PCHs on icecream/ccache change, take #2
It turns out $(gb_SPACE) is not just one space.
Change-Id: I8f5cd13d14d71f0a6dd7d8b89ee857f983d27d20
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125309
Tested-by: Jenkins
Reviewed-by: Luboš Luňák <l.lu...@collabora.com>
diff --git a/solenv/gbuild/PrecompiledHeaders.mk
b/solenv/gbuild/PrecompiledHeaders.mk
index 73cc86c88ee7..be0ae7950c4d 100644
--- a/solenv/gbuild/PrecompiledHeaders.mk
+++ b/solenv/gbuild/PrecompiledHeaders.mk
@@ -39,8 +39,9 @@ ifneq ($(gb_ENABLE_PCH),)
# all cxxflags to use for compilation
gb_PrecompiledHeader_cxxflags_includes := $$(PCH_DEFS) $$(PCH_CXXFLAGS)
$$(gb_PrecompiledHeader_EXCEPTIONFLAGS)
# flags to save to the .flags file to check if they are the same as last time
+# (note: the leading space in sed is important, to remove the option and its
separating space)
gb_PrecompiledHeader_flags_for_flags_file := $$(sort
$(gb_PrecompiledHeader_cxxflags_includes)) \
- $(if $(gb_PrecompiledHeader_ignore_flags_for_flags_file),| sed
's/$(gb_PrecompiledHeader_ignore_flags_for_flags_file)//')
+ $(if $(gb_PrecompiledHeader_ignore_flags_for_flags_file),| sed 's/
$(gb_PrecompiledHeader_ignore_flags_for_flags_file)//')
# $(call
gb_PrecompiledHeader_generate_rules,pchtarget,linktarget,linktargetmakefilename,pchcxxfile,compiler)
define gb_PrecompiledHeader_generate_rules
diff --git a/solenv/gbuild/platform/com_GCC_defs.mk
b/solenv/gbuild/platform/com_GCC_defs.mk
index 4e82b607d8b9..c8f81ff15dc7 100644
--- a/solenv/gbuild/platform/com_GCC_defs.mk
+++ b/solenv/gbuild/platform/com_GCC_defs.mk
@@ -218,7 +218,7 @@ gb_PrecompiledHeader_EXCEPTIONFLAGS :=
$(gb_LinkTarget_EXCEPTIONFLAGS)
# We turn on and off this one depending on whether icecream and/or ccache are
used,
# and changing cxxflags cause PCH rebuilds, so e.g. a plain temporary
'CCACHE_DISABLE=1'
# would cause a rebuild. Ignore the flag there, it's irrelevant for PCH use
anyway.
-gb_PrecompiledHeader_ignore_flags_for_flags_file := $(gb_SPACE)-Wunused-macros
+gb_PrecompiledHeader_ignore_flags_for_flags_file := -Wunused-macros
# optimization level
gb_COMPILERNOOPTFLAGS := -O0 -fstrict-aliasing -fstrict-overflow
