diff options
| -rw-r--r-- | qbs/modules/libclang/libclang.qbs | 3 | ||||
| -rw-r--r-- | src/shared/clang/clang_installation.pri | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/qbs/modules/libclang/libclang.qbs b/qbs/modules/libclang/libclang.qbs index e95250ddba..a6db78d551 100644 --- a/qbs/modules/libclang/libclang.qbs +++ b/qbs/modules/libclang/libclang.qbs @@ -11,6 +11,7 @@ Module { property stringList hostOS: qbs.hostOS property stringList targetOS: qbs.targetOS + property stringList toolchain: qbs.toolchain property string llvmConfig property string llvmVersion @@ -38,6 +39,8 @@ Module { llvmToolingDefines = toolingParams.defines; llvmToolingIncludes = toolingParams.includes; llvmToolingCxxFlags = toolingParams.cxxFlags; + if (toolchain.contains("gcc")) + res.push("-Wno-unused-parameter"); llvmFormattingLibs = ClangFunctions.formattingLibs(llvmConfig, QtcFunctions, targetOS); found = llvmConfig && File.exists(llvmIncludeDir.concat("/clang-c/Index.h")); } diff --git a/src/shared/clang/clang_installation.pri b/src/shared/clang/clang_installation.pri index 5ea21874fb..acd555dd06 100644 --- a/src/shared/clang/clang_installation.pri +++ b/src/shared/clang/clang_installation.pri @@ -177,6 +177,7 @@ isEmpty(LLVM_VERSION) { GCC_MAJOR_VERSION = $$section(GCC_VERSION, ., 0, 0) # GCC8 warns about memset/memcpy for types with copy ctor. Clang has some of these. greaterThan(GCC_MAJOR_VERSION, 7):QMAKE_CXXFLAGS += -Wno-class-memaccess + QMAKE_CXXFLAGS += -Wno-unused-parameter } LLVM_LIBDIR = $$quote($$system($$llvm_config --libdir, lines)) |