diff options
| author | Vikas Pachdha <vikas.pachdha@qt.io> | 2019-01-02 11:35:34 +0100 |
|---|---|---|
| committer | Vikas Pachdha <vikas.pachdha@qt.io> | 2019-01-09 12:38:25 +0000 |
| commit | ce9081f34098cfe9d0766d845052fe3215a11f60 (patch) | |
| tree | 1e92f2775ca931bbeb250c8464d0fc94d6dc6bbc /src | |
| parent | 986ce6fb9869a8e457b47f91ef3c394f4a480305 (diff) | |
Android: Find triple from predefined targets
Task-number: QTCREATORBUG-21780
Change-Id: Ic6e94a0ef94fc253f8a60383b2d060851b135d9f
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/plugins/android/androidtoolchain.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/plugins/android/androidtoolchain.cpp b/src/plugins/android/androidtoolchain.cpp index dd8d4ccfb2..1a7315309d 100644 --- a/src/plugins/android/androidtoolchain.cpp +++ b/src/plugins/android/androidtoolchain.cpp @@ -139,7 +139,11 @@ QString AndroidToolChain::makeCommand(const Environment &env) const GccToolChain::DetectedAbisResult AndroidToolChain::detectSupportedAbis() const { - return GccToolChain::DetectedAbisResult({targetAbi()}, originalTargetTriple()); + for (auto itr = ClangTargets.constBegin();itr != ClangTargets.constEnd(); ++itr) { + if (itr.value() == targetAbi()) + return GccToolChain::DetectedAbisResult({targetAbi()}, itr.key()); + } + return GccToolChain::DetectedAbisResult({targetAbi()}, ""); } |