Fix bogus warning about missing objcopy in setup-toolchains on macOS

Task-number: QBS-1192
Change-Id: I517b08100cea0154372b6b2fd7a9ac10778a7358
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>

1 files changed, 13 insertions, 2 deletions

diff --git a/src/app/qbs-setup-toolchains/probe.cpp b/src/app/qbs-setup-toolchains/probe.cpp
index 735285718..2bb99abfd 100644
--- a/src/app/qbs-setup-toolchains/probe.cpp
+++ b/src/app/qbs-setup-toolchains/probe.cpp
@@ -48,6 +48,7 @@
 #include <tools/profile.h>
 #include <tools/settings.h>
 #include <tools/toolchains.h>
+#include <tools/stlutils.h>
 
 #include <QtCore/qdir.h>
 #include <QtCore/qfileinfo.h>
@@ -185,6 +186,17 @@ private:
     QString m_toolchainPrefix;
 };
 
+static bool doesProfileTargetOS(const Profile &profile, const QString &os)
+{
+    const auto target = profile.value(QStringLiteral("qbs.targetOS"));
+    if (target.isValid())
+        return target.toStringList().contains(os);
+    const auto host = profile.value(QStringLiteral("qbs.hostOS"));
+    if (host.isValid())
+        return host.toStringList().contains(os);
+    return Internal::contains(HostOsInfo::hostOSIdentifiers(), os.toStdString());
+}
+
 static Profile createGccProfile(const QString &compilerFilePath, Settings *settings,
                                 const QStringList &toolchainTypes,
                                 const QString &profileName = QString())
@@ -211,8 +223,7 @@ static Profile createGccProfile(const QString &compilerFilePath, Settings *setti
     toolPathSetup.apply(QLatin1String("ar"), QLatin1String("cpp.archiverPath"));
     toolPathSetup.apply(QLatin1String("as"), QLatin1String("cpp.assemblerPath"));
     toolPathSetup.apply(QLatin1String("nm"), QLatin1String("cpp.nmPath"));
-    if (profile.value(QStringLiteral("qbs.targetOS"))
-            .toStringList().contains(QStringLiteral("darwin")))
+    if (doesProfileTargetOS(profile, QStringLiteral("darwin")))
         toolPathSetup.apply(QLatin1String("dsymutil"), QLatin1String("cpp.dsymutilPath"));
     else
         toolPathSetup.apply(QLatin1String("objcopy"), QLatin1String("cpp.objcopyPath"));