From 428cf949145844c30c45203953cf336a1756acb6 Mon Sep 17 00:00:00 2001 From: Anton Bondarenko Date: Tue, 28 Jan 2025 16:13:12 +0100 Subject: [PATCH] Fix compatibility with 6.5 build system Version 6.5 does not support conlyopts for cc_library and C only options need to be handled in a different way Signed-off-by: Anton Bondarenko --- kai_defs.bzl | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/kai_defs.bzl b/kai_defs.bzl index 79bfd24f..c73d42a1 100644 --- a/kai_defs.bzl +++ b/kai_defs.bzl @@ -32,10 +32,12 @@ def kai_gcc_warn_conlyopts(): return [ "-Wmissing-prototypes", "-Wstrict-prototypes", + "-Wpedantic", ] +# GCC/CLANG C++ only warning options def kai_gcc_warn_cxxopts(): - return kai_gcc_warn_copts() + [ + return [ "-Wctor-dtor-privacy", "-Weffc++", "-Woverloaded-virtual", @@ -45,11 +47,11 @@ def kai_gcc_warn_cxxopts(): # GCC/CLANG compiler options def kai_gcc_std_copts(): - return ["-std=c99", "-Wpedantic"] + kai_gcc_warn_copts() + return ["-std=c99"] + kai_gcc_warn_copts() + kai_gcc_warn_conlyopts() # GCC/CLANG compiler options def kai_gcc_std_cxxopts(): - return ["-std=c++17"] + kai_gcc_warn_cxxopts() + return ["-std=c++17"] + kai_gcc_warn_copts() + kai_gcc_warn_cxxopts() def kai_cpu_select(cpu_uarch): if len(cpu_uarch) == 0: @@ -149,7 +151,6 @@ def _kai_c_cxx_common(name, copts_def_func, **kwargs): extra_copts.append("-fno-tree-vectorize") kwargs["copts"] = kwargs.get("copts", []) + copts_def_func(cpu_uarch) + extra_copts - kwargs["conlyopts"] = kai_gcc_warn_conlyopts() kwargs["deps"] = ["//:common"] + kwargs.get("deps", []) kwargs["linkstatic"] = kwargs.get("linkstatic", True) -- GitLab