From 6f9f6ccc9df6eb6d33e8f1d334df642ad81c2568 Mon Sep 17 00:00:00 2001 From: Mat Sutcliffe Date: Tue, 18 Jun 2019 22:51:14 +0100 Subject: [PATCH] Extra ccache options to allow sharing caches between different Jenkins jobs. --- mkspecs/features/common_pre.prf | 6 ++++++ scripts/jenkins.py | 1 + 2 files changed, 7 insertions(+) diff --git a/mkspecs/features/common_pre.prf b/mkspecs/features/common_pre.prf index b83330a22..26ca79b7f 100644 --- a/mkspecs/features/common_pre.prf +++ b/mkspecs/features/common_pre.prf @@ -62,6 +62,12 @@ swiftConfig(ccache) { msvc: QMAKE_CXX = clcache else:macx: QMAKE_CXX = /usr/local/bin/ccache $$QMAKE_CXX else:gcc: QMAKE_CXX = ccache $$QMAKE_CXX + unix { + QMAKE_CFLAGS_DEBUG *= -fdebug-prefix-map=$$(CCACHE_BASEDIR)=. + QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO *= -fdebug-prefix-map=$$(CCACHE_BASEDIR)=. + QMAKE_CXXFLAGS_DEBUG *= -fdebug-prefix-map=$$(CCACHE_BASEDIR)=. + QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO *= -fdebug-prefix-map=$$(CCACHE_BASEDIR)=. + } } ################################ diff --git a/scripts/jenkins.py b/scripts/jenkins.py index 7ebe9e2cf..229170d32 100644 --- a/scripts/jenkins.py +++ b/scripts/jenkins.py @@ -55,6 +55,7 @@ class Builder: os.environ['CLCACHE_DIR'] = 'C:\\clcache' # workaround https://github.com/frerich/clcache/issues/342 os.environ['CLCACHE_BASEDIR'] = os.environ['WORKSPACE'] os.environ['CCACHE_BASEDIR'] = os.environ['WORKSPACE'] + os.environ['CCACHE_NOHASHDIR'] = '1' def build(self, jobs, qmake_args, dev_build, eolInMonth): """