From 42d6704c4f690d34ce8751cec6db0c3600b23fbf Mon Sep 17 00:00:00 2001 From: Christian Stenger Date: Wed, 30 Mar 2022 06:56:15 +0200 Subject: [PATCH] ClangFormat: Fix build on Windows and macOS Amends 355c5a7c7334e2813. Change-Id: I4c350d92766e35fca2230c756fb07772e0524c08 Reviewed-by: Christian Kandeler --- src/plugins/clangformat/clangformat.qbs | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/plugins/clangformat/clangformat.qbs b/src/plugins/clangformat/clangformat.qbs index aab84409abd..f7d60ad73d1 100644 --- a/src/plugins/clangformat/clangformat.qbs +++ b/src/plugins/clangformat/clangformat.qbs @@ -20,7 +20,12 @@ QtcPlugin { && (!qbs.targetOS.contains("windows") || libclang.llvmBuildModeMatches) cpp.cxxFlags: base.concat(libclang.llvmToolingCxxFlags) - cpp.linkerFlags: base.concat(["--exclude-libs", "ALL"]) + cpp.linkerFlags: { + var flags = base; + if (qbs.targetOS.contains("unix") && !qbs.targetOS.contains("macos")) + flags.push("--exclude-libs", "ALL"); + return flags; + } cpp.includePaths: base.concat(libclang.llvmIncludeDir) cpp.libraryPaths: base.concat(libclang.llvmLibDir) cpp.dynamicLibraries: base.concat(libclang.llvmFormattingLibs)