diff options
| author | Thorsten Behrens <thorsten.behrens@allotropia.de> | 2021-04-02 22:11:59 +0200 |
|---|---|---|
| committer | Thorsten Behrens <thorsten.behrens@allotropia.de> | 2021-04-03 21:17:48 +0200 |
| commit | 18cc01b63996f81b284e3bc827d1be7f3da8983a (patch) | |
| tree | 0028a3fcd9d1ed12e131be93e6f740c7029c91ad /solenv | |
| parent | f1b55d3f8e963069fc798bcf559ae9af2bf18b64 (diff) | |
Add initial support for sccache builds on WNT
- gets auto-detected if an sccache binary is in the path
- currently external projects using gcc-wrapper are _not_
cached - this needs fixing in the gcc-wrapper
- current sccache versions won't work with -Fp (precompiled
headers), so while sccache gets called, nothing really
is cached. Best build with --enable-pch=no therefore.
Change-Id: I78dd7e08ea20ae888236c8c8e8e7a25a405f23b5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113530
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de>
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/platform/com_MSC_class.mk | 4 | ||||
| -rw-r--r-- | solenv/gbuild/platform/com_MSC_defs.mk | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/solenv/gbuild/platform/com_MSC_class.mk b/solenv/gbuild/platform/com_MSC_class.mk index 2f4e29c3ace1..3e2ea893ae08 100644 --- a/solenv/gbuild/platform/com_MSC_class.mk +++ b/solenv/gbuild/platform/com_MSC_class.mk @@ -612,10 +612,10 @@ endef # /opt/lo/bin/ccache /cygdrive/c/PROGRA~2/MICROS~2.0/VC/bin/cl.exe gb_AUTOCONF_WRAPPERS = \ - REAL_CC="$(shell cygpath -w $(filter-out -%,$(CC)))" \ + REAL_CC="$(shell cygpath -w $(filter-out -%,$(UNCACHED_CC)))" \ REAL_CC_FLAGS="$(filter -%,$(CC))" \ CC="$(call gb_Executable_get_target_for_build,gcc-wrapper)" \ - REAL_CXX="$(shell cygpath -w $(filter-out -%,$(CXX)))" \ + REAL_CXX="$(shell cygpath -w $(filter-out -%,$(UNCACHED_CXX)))" \ REAL_CXX_FLAGS="$(filter -%,$(CXX))" \ CXX="$(call gb_Executable_get_target_for_build,g++-wrapper)" \ LD="$(shell cygpath -w $(COMPATH)/bin/link.exe) -nologo" diff --git a/solenv/gbuild/platform/com_MSC_defs.mk b/solenv/gbuild/platform/com_MSC_defs.mk index e7ccb0107562..708d30f023c8 100644 --- a/solenv/gbuild/platform/com_MSC_defs.mk +++ b/solenv/gbuild/platform/com_MSC_defs.mk @@ -315,7 +315,7 @@ endef # we explicitly have to replace cygwin with mingw32 for the host, but the build must stay cygwin, or cmd.exe processes will be spawned gb_WIN_GPG_WINDRES_target := $(if $(filter INTEL,$(CPUNAME)),pe-i386,pe-x86-64) gb_WIN_GPG_platform_switches := --build=$(BUILD_PLATFORM) --host=$(subst cygwin,mingw32,$(HOST_PLATFORM)) -gb_WIN_GPG_cross_setup_exports = export REAL_BUILD_CC="$(filter-out -%,$(CC_FOR_BUILD))" REAL_BUILD_CC_FLAGS="$(filter -%,$(CC_FOR_BUILD))" \ +gb_WIN_GPG_cross_setup_exports = export REAL_BUILD_CC="$(filter-out -%,$(UNCACHED_CC))" REAL_BUILD_CC_FLAGS="$(filter -%,$(UNCACHED_CC))" \ && export CC_FOR_BUILD="$(call gb_Executable_get_target_for_build,gcc-wrapper) --wrapper-env-prefix=REAL_BUILD_ $(SOLARINC) -L$(subst ;, -L,$(ILIB_FOR_BUILD))" \ && export RC='windres -O COFF --target=$(gb_WIN_GPG_WINDRES_target) --preprocessor='\''$(call gb_Executable_get_target_for_build,cpp) -+ -DRC_INVOKED -DWINAPI_FAMILY=0 $(SOLARINC)'\' |