diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2020-05-29 12:16:48 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2020-05-29 11:52:24 +0000 |
| commit | be97943372bc80d2440daa20cd658599d765b9a9 (patch) | |
| tree | 7e381f5fd9b05e3bcf102d02b88b48db0e37cdf0 | |
| parent | 4a6aa35a9151e083a45e76d04a847832bc7d588c (diff) | |
| download | qt-creator-be97943372bc80d2440daa20cd658599d765b9a9.tar.gz | |
CompilationDbProjectManager: Do not remove -fpic from command lines
This flag is needed by the code model. The test case that had it on the
command line was invalid (clang does not allow -fPIC with win32
targets).
Fixes: QTCREATORBUG-24106
Change-Id: Ic95c82c2090ef5ee1a11d01d7e4387a5c80cda3c
Reviewed-by: Nikolai Kosjar <pinaceae.pinus@gmail.com>
| -rw-r--r-- | src/plugins/compilationdatabaseprojectmanager/compilationdatabaseutils.cpp | 4 | ||||
| -rw-r--r-- | src/plugins/compilationdatabaseprojectmanager/database_samples/qtc/compile_commands.json | 3 |
2 files changed, 2 insertions, 5 deletions
diff --git a/src/plugins/compilationdatabaseprojectmanager/compilationdatabaseutils.cpp b/src/plugins/compilationdatabaseprojectmanager/compilationdatabaseutils.cpp index c198b89304..db8aa96d58 100644 --- a/src/plugins/compilationdatabaseprojectmanager/compilationdatabaseutils.cpp +++ b/src/plugins/compilationdatabaseprojectmanager/compilationdatabaseutils.cpp @@ -150,9 +150,7 @@ void filteredFlags(const QString &fileName, } if (flag == "-o" || flag == "-MF" || flag == "-c" || flag == "-pedantic" - || flag.startsWith("-O") || flag.startsWith("-W") || flag.startsWith("-w") - || QString::compare(flag, "-fpic", Qt::CaseInsensitive) == 0 - || QString::compare(flag, "-fpie", Qt::CaseInsensitive) == 0) { + || flag.startsWith("-O") || flag.startsWith("-W") || flag.startsWith("-w")) { continue; } diff --git a/src/plugins/compilationdatabaseprojectmanager/database_samples/qtc/compile_commands.json b/src/plugins/compilationdatabaseprojectmanager/database_samples/qtc/compile_commands.json index d75e8d9654..d971ebbf09 100644 --- a/src/plugins/compilationdatabaseprojectmanager/database_samples/qtc/compile_commands.json +++ b/src/plugins/compilationdatabaseprojectmanager/database_samples/qtc/compile_commands.json @@ -33,7 +33,6 @@ "-DQT_CONCURRENT_LIB", "-DQT_NETWORK_LIB", "-DQT_CORE_LIB", - "-fPIC", "-I", "C:\\Qt\\5.9.2\\mingw53_32\\include", "-I", @@ -59,4 +58,4 @@ "directory": "C:/build-qtcreator-MinGW_32bit-Debug", "file": "C:/qt-creator/src/plugins/cpptools/compileroptionsbuilder.cpp" } -]
\ No newline at end of file +] |