From 1975641a3d0ccb3f36452524a57f7d2303b62b25 Mon Sep 17 00:00:00 2001 From: Marco Bubke Date: Tue, 23 Apr 2019 16:42:51 +0200 Subject: [PATCH] ClangPchManager: Remove target triple We don't need it so far and it is creating trouble. Change-Id: Ia502452717b5be935e4ba2cd2de04007e4144199 Reviewed-by: Ivan Donchevskii --- src/plugins/clangpchmanager/projectupdater.cpp | 2 +- tests/unit/unittest/projectupdater-test.cpp | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/plugins/clangpchmanager/projectupdater.cpp b/src/plugins/clangpchmanager/projectupdater.cpp index fc8db5bc07b..f2bd14b383e 100644 --- a/src/plugins/clangpchmanager/projectupdater.cpp +++ b/src/plugins/clangpchmanager/projectupdater.cpp @@ -154,7 +154,7 @@ QStringList ProjectUpdater::toolChainArguments(CppTools::ProjectPart *projectPar builder.addWordWidth(); builder.addPicIfCompilerFlagsContainsIt(); - builder.addTargetTriple(); + // builder.addTargetTriple(); TODO resarch why target triples are different builder.addExtraCodeModelFlags(); builder.undefineClangVersionMacrosForMsvc(); builder.undefineCppLanguageFeatureMacrosForMsvc2015(); diff --git a/tests/unit/unittest/projectupdater-test.cpp b/tests/unit/unittest/projectupdater-test.cpp index 7a714533faa..21ee3f5781e 100644 --- a/tests/unit/unittest/projectupdater-test.cpp +++ b/tests/unit/unittest/projectupdater-test.cpp @@ -352,7 +352,6 @@ TEST_F(ProjectUpdater, ToolChainArguments) ASSERT_THAT(arguments, ElementsAre(QString{"-m32"}, QString{"-fPIC"}, - QString{"--target=target"}, QString{"extraflags"}, QString{"-include"}, QString{"config.h"})); @@ -369,7 +368,6 @@ TEST_F(ProjectUpdater, ToolChainArgumentsMSVC) ASSERT_THAT(arguments, ElementsAre(QString{"-m32"}, - QString{"--target=target"}, QString{"extraflags"}, QString{"-U__clang__"}, QString{"-U__clang_major__"},