feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

ClangPchManager: Remove target triple

Browse Source 
We don't need it so far and it is creating trouble.

Change-Id: Ia502452717b5be935e4ba2cd2de04007e4144199
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
This commit is contained in:
Marco Bubke
2019-04-23 16:42:51 +02:00
parent 1ae98c3595
commit 1975641a3d
2 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/clangpchmanager/projectupdater.cpp
View File

@@ -154,7 +154,7 @@ QStringList ProjectUpdater::toolChainArguments(CppTools::ProjectPart *projectPar
builder.addWordWidth(); builder.addWordWidth();
builder.addPicIfCompilerFlagsContainsIt(); builder.addPicIfCompilerFlagsContainsIt();
builder.addTargetTriple(); // builder.addTargetTriple(); TODO resarch why target triples are different
builder.addExtraCodeModelFlags(); builder.addExtraCodeModelFlags();
builder.undefineClangVersionMacrosForMsvc(); builder.undefineClangVersionMacrosForMsvc();
builder.undefineCppLanguageFeatureMacrosForMsvc2015(); builder.undefineCppLanguageFeatureMacrosForMsvc2015();

2
tests/unit/unittest/projectupdater-test.cpp
View File

@@ -352,7 +352,6 @@ TEST_F(ProjectUpdater, ToolChainArguments)
ASSERT_THAT(arguments, ASSERT_THAT(arguments,
ElementsAre(QString{"-m32"}, ElementsAre(QString{"-m32"},
QString{"-fPIC"}, QString{"-fPIC"},
QString{"--target=target"},
QString{"extraflags"}, QString{"extraflags"},
QString{"-include"}, QString{"-include"},
QString{"config.h"})); QString{"config.h"}));
@@ -369,7 +368,6 @@ TEST_F(ProjectUpdater, ToolChainArgumentsMSVC)
ASSERT_THAT(arguments, ASSERT_THAT(arguments,
ElementsAre(QString{"-m32"}, ElementsAre(QString{"-m32"},
QString{"--target=target"},
QString{"extraflags"}, QString{"extraflags"},
QString{"-U__clang__"}, QString{"-U__clang__"},
QString{"-U__clang_major__"}, QString{"-U__clang_major__"},