diff --git a/README.md b/README.md index aa12c42..44b36ef 100644 --- a/README.md +++ b/README.md @@ -37,5 +37,5 @@ $ docker run -ti --rm -v $(pwd):/x -w /x debian:buster-slim # apt update && apt install curl ca-certificates -y && curl -L https://github.com/bazelbuild/bazelisk/releases/download/v1.7.5/bazelisk-linux-amd64 > /usr/local/bin/bazel && chmod +x /usr/local/bin/bazel # export CC=/usr/bin/false # bazel run --platforms @com_github_ziglang_zig//:platform_linux-x86_64-musl //test:gomusl -# bazel run --platforms @com_github_ziglang_zig//:platform_linux-x86_64-glibc //test:gognu +# bazel run --platforms @com_github_ziglang_zig//:platform_linux-x86_64-gnu //test:gognu ``` diff --git a/zig-toolchains/BUILD b/zig-toolchains/BUILD index 28143e2..62889d3 100644 --- a/zig-toolchains/BUILD +++ b/zig-toolchains/BUILD @@ -1,16 +1,11 @@ constraint_setting(name = "libc") -constraint_value( - name = "glibc_2_28", - constraint_setting = ":libc", -) - constraint_value( name = "musl", constraint_setting = ":libc", ) -#constraint_value( -# name = "glibc_2_19", -# constraint_setting = ":libc", -#) +constraint_value( + name = "gnu_2_19", + constraint_setting = ":libc", +) diff --git a/zig-toolchains/defs.bzl b/zig-toolchains/defs.bzl index 2c242c2..54c3103 100644 --- a/zig-toolchains/defs.bzl +++ b/zig-toolchains/defs.bzl @@ -53,7 +53,7 @@ TARGET_CONFIGS = [ constraint_values=[ "@platforms//os:linux", "@platforms//cpu:x86_64", - ":glibc_2_19", + ":gnu_2_19", ], tool_paths={"ld": "ld.lld"}, ), @@ -126,7 +126,7 @@ zig_build_macro(absolute_path={absolute_path}, zig_include_root={zig_include_roo constraint_setting(name = "libc") constraint_value( - name = "glibc_2_19", + name = "gnu_2_19", constraint_setting = ":libc", ) @@ -146,11 +146,11 @@ platform( ) platform( - name = "platform_linux-x86_64-glibc", + name = "platform_linux-x86_64-gnu", constraint_values = [ "@platforms//os:linux", "@platforms//cpu:x86_64", - ":glibc_2_19", + ":gnu_2_19", ], )