This is an automated email from the ASF dual-hosted git repository.
huijun pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-heron.git
The following commit(s) were added to refs/heads/master by this push:
new b760eab fixtoolchain (#3563)
b760eab is described below
commit b760eabc5a4c671bce0fa0f8164c047605a54787
Author: bed debug <[email protected]>
AuthorDate: Sat Jul 11 13:23:49 2020 -0700
fixtoolchain (#3563)
---
tools/travis/toolchain/BUILD | 11 +++++------
tools/travis/toolchain/cc_toolchain_config.bzl | 18 ++++++++++++++++++
2 files changed, 23 insertions(+), 6 deletions(-)
diff --git a/tools/travis/toolchain/BUILD b/tools/travis/toolchain/BUILD
index d1837a9..157a1d8 100644
--- a/tools/travis/toolchain/BUILD
+++ b/tools/travis/toolchain/BUILD
@@ -1,4 +1,5 @@
load("@rules_cc//cc:defs.bzl", "cc_toolchain")
+load(":cc_toolchain_config.bzl", "cc_toolchain_config")
licenses(["restricted"])
@@ -27,32 +28,30 @@ filegroup(
],
)
+cc_toolchain_config(name = "k8_toolchain_config")
+
cc_toolchain(
name = "cc-compiler-local",
all_files = ":empty",
compiler_files = ":empty",
- cpu = "local",
dwp_files = ":empty",
- dynamic_runtime_libs = [":empty"],
linker_files = ":empty",
objcopy_files = ":empty",
- static_runtime_libs = [":empty"],
strip_files = ":empty",
supports_param_files = 0,
+ toolchain_config = ":k8_toolchain_config",
)
cc_toolchain(
name = "cc-compiler-k8",
all_files = ":empty",
compiler_files = ":empty",
- cpu = "local",
dwp_files = ":empty",
- dynamic_runtime_libs = [":empty"],
linker_files = ":empty",
objcopy_files = ":empty",
- static_runtime_libs = [":empty"],
strip_files = ":empty",
supports_param_files = 0,
+ toolchain_config = ":k8_toolchain_config",
)
filegroup(
diff --git a/tools/travis/toolchain/cc_toolchain_config.bzl
b/tools/travis/toolchain/cc_toolchain_config.bzl
new file mode 100644
index 0000000..d8f0a3d
--- /dev/null
+++ b/tools/travis/toolchain/cc_toolchain_config.bzl
@@ -0,0 +1,18 @@
+def _impl(ctx):
+ return cc_common.create_cc_toolchain_config_info(
+ ctx = ctx,
+ toolchain_identifier = "k8-toolchain",
+ host_system_name = "local",
+ target_system_name = "local",
+ target_cpu = "k8",
+ target_libc = "unknown",
+ compiler = "clang",
+ abi_version = "unknown",
+ abi_libc_version = "unknown",
+ )
+
+cc_toolchain_config = rule(
+ implementation = _impl,
+ attrs = {},
+ provides = [CcToolchainConfigInfo],
+)
\ No newline at end of file