diff options
| author | Luboš Luňák <l.lunak@collabora.com> | 2021-11-16 15:03:27 +0100 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@collabora.com> | 2021-11-16 18:36:23 +0100 |
| commit | f22e5078cfac93c50ae5169f65450918b34b0e99 (patch) | |
| tree | 57dcc948762a38005a4ed0dba8c810f770f8aa1e /solenv | |
| parent | 71b9369f1cc40143108e3f2189d96e402895e315 (diff) | |
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.lunak@collabora.com>
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/PrecompiledHeaders.mk | 3 | ||||
| -rw-r--r-- | solenv/gbuild/platform/com_GCC_defs.mk | 2 |
2 files changed, 3 insertions, 2 deletions
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 |