build: specify C toolchains correctly (#1128)

This commit is contained in:
Malte Poll 2023-02-01 12:48:19 +01:00 committed by GitHub
parent 6166b52f5d
commit 0b32f7abb4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 7 deletions

View File

@ -1,6 +1,6 @@
build --incompatible_enable_cc_toolchain_resolution
build --action_env BAZEL_DO_NOT_DETECT_CPP_TOOLCHAIN=1
build --platforms @zig_sdk//libc_aware/platform:linux_amd64_gnu.2.34
build --extra_toolchains @zig_sdk//libc_aware/toolchain:linux_amd64_gnu.2.34
build --incompatible_use_toolchain_resolution_for_java_rules
build --java_runtime_version=pinned_remotejdk_11
build --tool_java_runtime_version=pinned_remotejdk_11
@ -9,10 +9,6 @@ test --tool_java_runtime_version=pinned_remotejdk_11
test --incompatible_use_toolchain_resolution_for_java_rules
build:linux_amd64 --platforms @zig_sdk//libc_aware/platform:linux_amd64_gnu.2.34
build:linux_amd64 --extra_toolchains @zig_sdk//libc_aware/toolchain:linux_amd64_gnu.2.34
build:linux_arm64 --platforms @zig_sdk//libc_aware/platform:linux_arm64_gnu.2.34
build:linux_arm64 --extra_toolchains @zig_sdk//libc_aware/toolchain:linux_arm64_gnu.2.34
build:linux_amd64_static --platforms @zig_sdk//platform:linux_amd64
build:linux_amd64_static --extra_toolchains @zig_sdk//toolchain:linux_amd64_musl
build:linux_arm64_static --platforms @zig_sdk//platform:linux_arm64
build:linux_arm64_static --extra_toolchains @zig_sdk//toolchain:linux_arm64_musl
build:linux_amd64_static --platforms @zig_sdk//libc_aware/platform:linux_amd64_musl
build:linux_arm64_static --platforms @zig_sdk//libc_aware/platform:linux_arm64_musl

View File

@ -64,8 +64,13 @@ zig_toolchains()
register_toolchains(
"@zig_sdk//libc_aware/toolchain:linux_amd64_gnu.2.34",
"@zig_sdk//libc_aware/toolchain:linux_arm64_gnu.2.34",
"@zig_sdk//libc_aware/toolchain:linux_amd64_musl",
"@zig_sdk//libc_aware/toolchain:linux_arm64_musl",
"@zig_sdk//toolchain:linux_amd64_gnu.2.34",
"@zig_sdk//toolchain:linux_arm64_gnu.2.34",
"@zig_sdk//toolchain:linux_amd64_musl",
"@zig_sdk//toolchain:linux_arm64_musl",
"@zig_sdk//toolchain:darwin_amd64",
"@zig_sdk//toolchain:darwin_arm64",
"@zig_sdk//toolchain:windows_amd64",