From f164afe89aa7a8e62b30fd54c3ed14a0732d87e4 Mon Sep 17 00:00:00 2001 From: Goni Zahavy Date: Thu, 13 Apr 2023 11:04:59 +0000 Subject: [PATCH] Removed leftovers of `compiler_extra_includes` --- toolchain/defs.bzl | 1 - toolchain/private/cc_toolchains.bzl | 2 -- 2 files changed, 3 deletions(-) diff --git a/toolchain/defs.bzl b/toolchain/defs.bzl index ba68703..80be3fd 100644 --- a/toolchain/defs.bzl +++ b/toolchain/defs.bzl @@ -250,7 +250,6 @@ def declare_files(os): for target_config in target_structs(): all_includes = [native.glob(["lib/{}/**".format(i)]) for i in target_config.includes] - all_includes.append(getattr(target_config, "compiler_extra_includes", [])) cxx_tool_label = ":" + zig_tool_path(os).format( zig_tool = "c++", diff --git a/toolchain/private/cc_toolchains.bzl b/toolchain/private/cc_toolchains.bzl index 43d6a99..0b70bf0 100644 --- a/toolchain/private/cc_toolchains.bzl +++ b/toolchain/private/cc_toolchains.bzl @@ -33,8 +33,6 @@ def declare_cc_toolchains(os, zig_sdk_path): linkopts = [] for s in getattr(target_config, "linker_version_scripts", []): linkopts = ["-Wl,--version-script,%s/%s" % (zig_sdk_path, s)] - for incl in getattr(target_config, "compiler_extra_includes", []): - copts = copts + ["-include", zig_sdk_path + "/" + incl] # We can't pass a list of structs to a rule, so we use json encoding. artifact_name_patterns = getattr(target_config, "artifact_name_patterns", [])