[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kdevelop] plugins/custom-definesandincludes/compilerprovider: Fix test_problems on FreeBSD.
From:       Gleb Popov <null () kde ! org>
Date:       2018-07-24 6:26:46
Message-ID: E1fhqmU-0007so-J0 () code ! kde ! org
[Download RAW message or body]

Git commit 484eee3f6386cc8c9c0e3282abeddb9658770211 by Gleb Popov.
Committed on 24/07/2018 at 06:24.
Pushed by arrowdodger into branch 'master'.

Fix test_problems on FreeBSD.

custom-definesandincludes plugin used varargs.h file to check if the include path is \
built-in one. On FreeBSD Clang's built-in path doesn't have this header, so use \
another one.

Diffirential Revision: https://phabricator.kde.org/D13613

M  +1    -1    plugins/custom-definesandincludes/compilerprovider/gcclikecompiler.cpp

https://commits.kde.org/kdevelop/484eee3f6386cc8c9c0e3282abeddb9658770211

diff --git a/plugins/custom-definesandincludes/compilerprovider/gcclikecompiler.cpp \
b/plugins/custom-definesandincludes/compilerprovider/gcclikecompiler.cpp index \
                5b6a785def..860d7d3de4 100644
--- a/plugins/custom-definesandincludes/compilerprovider/gcclikecompiler.cpp
+++ b/plugins/custom-definesandincludes/compilerprovider/gcclikecompiler.cpp
@@ -191,7 +191,7 @@ Path::List GccLikeCompiler::includes(Utils::LanguageType type, \
const QString& ar  // This is an include path, add it to the list.
                     auto hostPath = rt->pathInHost(Path(line.trimmed().toString()));
                     // but skip folders with compiler builtins, we cannot parse \
                these with clang
-                    if (!QFile::exists(hostPath.toLocalFile() + \
QLatin1String("/varargs.h"))) { +                    if \
                (!QFile::exists(hostPath.toLocalFile() + QLatin1String("/cpuid.h"))) \
                {
                         data.includePaths << \
Path(QFileInfo(hostPath.toLocalFile()).canonicalFilePath());  }
                 }


[prev in list] [next in list] [prev in thread] [next in thread]