[Libreoffice-commits] core.git: solenv/gbuild

[Luboš Luňák (via logerrit)]

 solenv/gbuild/platform/com_GCC_class.mk |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit b2d42856062236249f283ea7ec7336efa3a7a182
Author:     Luboš Luňák <l.lunak at collabora.com>
AuthorDate: Fri Jul 5 21:52:56 2019 +0200
Commit:     Luboš Luňák <l.lunak at collabora.com>
CommitDate: Sat Jul 6 10:09:03 2019 +0200

    build Clang PCH always with the same working dir
    
    It seems Clang saves current working directory in the PCH, so if
    the PCH is once built during 'make' and other time during 'make -C sc',
    then those two PCHs are binary different (but functionally equivalent),
    leading to ccache misses.
    
    Change-Id: I406c0ff5f31b4433168dfef363e778361027a852
    Reviewed-on: https://gerrit.libreoffice.org/75146
    Tested-by: Jenkins
    Reviewed-by: Luboš Luňák <l.lunak at collabora.com>

diff --git a/solenv/gbuild/platform/com_GCC_class.mk b/solenv/gbuild/platform/com_GCC_class.mk
index 5ae811ad81c7..18170c8eae2d 100644
--- a/solenv/gbuild/platform/com_GCC_class.mk
+++ b/solenv/gbuild/platform/com_GCC_class.mk
@@ -94,6 +94,7 @@ define gb_PrecompiledHeader__command
 $(call gb_Output_announce,$(2),$(true),PCH,1)
 $(call gb_Helper_abbreviate_dirs,\
 	mkdir -p $(dir $(1)) $(dir $(call gb_PrecompiledHeader_get_dep_target,$(2),$(7))) && \
+	cd $(BUILDDIR)/ && \
 	CCACHE_DISABLE=1 $(gb_COMPILER_SETUP) \
 	$(gb_CXX) \
 		-x c++-header \