diff options
author | Luboš Luňák <l.lunak@collabora.com> | 2019-11-07 11:51:51 +0100 |
---|---|---|
committer | Luboš Luňák <l.lunak@collabora.com> | 2019-11-27 09:55:08 +0100 |
commit | a8b73758e723656173aebaaa9d94926b03ca01d4 (patch) | |
tree | 00fd0248c07f661b00f8560bcdacbbdceadbb114 /compilerplugins | |
parent | 94d35ad02b94f9fd77d0c2bb1ea6d0a99c10a174 (diff) |
disable checkconfigmacros compiler check for UnpackedTarball
When building code using Skia, macros for Skia are defined
in config_skia.h, and Skia uses #ifdef to check for them, but that's
ok, and we neither care nor can do much about it.
Change-Id: I0029f0d82b26638e0395efec06c03303333ec1e9
Diffstat (limited to 'compilerplugins')
-rw-r--r-- | compilerplugins/clang/checkconfigmacros.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/compilerplugins/clang/checkconfigmacros.cxx b/compilerplugins/clang/checkconfigmacros.cxx index cff2d41dd6df..e48cca3fd291 100644 --- a/compilerplugins/clang/checkconfigmacros.cxx +++ b/compilerplugins/clang/checkconfigmacros.cxx @@ -97,7 +97,8 @@ void CheckConfigMacros::checkMacro( const Token& macroToken, SourceLocation loca { const char* filename = compiler.getSourceManager().getPresumedLoc( location ).getFilename(); if( filename == NULL - || !hasPathnamePrefix(filename, SRCDIR "/include/LibreOfficeKit/") ) + || ( !hasPathnamePrefix(filename, SRCDIR "/include/LibreOfficeKit/") + && !hasPathnamePrefix(filename, WORKDIR "/UnpackedTarball/" ))) { report( DiagnosticsEngine::Error, "checking whether a config macro %0 is defined", location ) << macroToken.getIdentifierInfo()->getName(); |