diff options
| author | Nikolai Kosjar <nikolai.kosjar@qt.io> | 2019-10-11 15:01:09 +0200 |
|---|---|---|
| committer | Nikolai Kosjar <nikolai.kosjar@qt.io> | 2019-10-22 11:46:42 +0000 |
| commit | 8f6eb41cad805556779c2bac67bdbead68fffda1 (patch) | |
| tree | 813c9968c55fab4a4ba37f04e9ffb558af248f25 | |
| parent | 6e3de85b337eb8a6a107abcef932ee21deabc3d5 (diff) | |
| download | qt-creator-8f6eb41cad805556779c2bac67bdbead68fffda1.tar.gz | |
Clang: Ensure that platform codegen flags get also filtered
Leave the function addExtraCodeModelFlags() around as it's used by
ClangPchManager::ProjectUpdater::toolChainArguments().
This allows us to filter out excess target arguments in a follow-up
change.
Change-Id: I742d713dd1ca6c391ba77c52555dcf4e94cc2ff9
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
| -rw-r--r-- | src/plugins/cpptools/compileroptionsbuilder.cpp | 5 | ||||
| -rw-r--r-- | tests/unit/unittest/compileroptionsbuilder-test.cpp | 4 |
2 files changed, 4 insertions, 5 deletions
diff --git a/src/plugins/cpptools/compileroptionsbuilder.cpp b/src/plugins/cpptools/compileroptionsbuilder.cpp index 7fde0b3a57..f13f0f1a26 100644 --- a/src/plugins/cpptools/compileroptionsbuilder.cpp +++ b/src/plugins/cpptools/compileroptionsbuilder.cpp @@ -140,8 +140,6 @@ QStringList CompilerOptionsBuilder::build(ProjectFile::Kind fileKind, addPrecompiledHeaderOptions(usePrecompiledHeaders); addProjectConfigFileInclude(); - addExtraCodeModelFlags(); - addMsvcCompatibilityVersion(); addProjectMacros(); undefineClangVersionMacrosForMsvc(); @@ -727,7 +725,8 @@ void CompilerOptionsBuilder::evaluateCompilerFlags() const Core::Id &toolChain = m_projectPart.toolchainType; bool containsDriverMode = false; bool skipNext = false; - for (const QString &option : m_projectPart.compilerFlags) { + const QStringList allFlags = m_projectPart.compilerFlags + m_projectPart.extraCodeModelFlags; + for (const QString &option : allFlags) { if (skipNext) { skipNext = false; continue; diff --git a/tests/unit/unittest/compileroptionsbuilder-test.cpp b/tests/unit/unittest/compileroptionsbuilder-test.cpp index 234fc0987c..df11072707 100644 --- a/tests/unit/unittest/compileroptionsbuilder-test.cpp +++ b/tests/unit/unittest/compileroptionsbuilder-test.cpp @@ -593,14 +593,14 @@ TEST_F(CompilerOptionsBuilder, BuildAllOptions) ASSERT_THAT(compilerOptionsBuilder.options(), ElementsAre("-nostdinc", "-nostdinc++", + "-arch", + "x86_64", "-fsyntax-only", "-m64", "--target=x86_64-apple-darwin10", "-x", "c++", "-std=c++17", - "-arch", - "x86_64", "-DprojectFoo=projectBar", "-I", IsPartOfHeader("wrappedQtHeaders"), "-I", IsPartOfHeader(toNative("wrappedQtHeaders/QtCore").toStdString()), |