Skip to content

chore!: pin the default glibc version to 2.17 #299

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
aherrmann merged 1 commit into from
May 11, 2024
Merged

chore!: pin the default glibc version to 2.17 #299

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions e2e/workspace/location-expansion/main.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,10 @@ test "-DTARGET is set" {
test "-DZIG_TARGET is set" {
const actual_target = try builtin.target.linuxTriple(std.testing.allocator);
defer std.testing.allocator.free(actual_target);
try std.testing.expectEqualStrings(
actual_target,
// TODO revert to an equality check.
try std.testing.expectStringStartsWith(
std.mem.sliceTo(zig_target, 0),
actual_target,
);
}

Expand Down
8 changes: 4 additions & 4 deletions zig/target/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ toolchain(

zig_target_toolchain(
name = "x86_32-linux-gnu",
target = "x86-linux-gnu",
target = "x86-linux-gnu.2.17",
)

toolchain(
Expand Down Expand Up @@ -112,7 +112,7 @@ toolchain(

zig_target_toolchain(
name = "x86_64-linux-gnu",
target = "x86_64-linux-gnu",
target = "x86_64-linux-gnu.2.17",
)

toolchain(
Expand Down Expand Up @@ -160,7 +160,7 @@ toolchain(

zig_target_toolchain(
name = "ppc-linux-gnu",
target = "powerpc-linux-gnu",
target = "powerpc-linux-gnu.2.17",
)

toolchain(
Expand Down Expand Up @@ -219,7 +219,7 @@ toolchain(

zig_target_toolchain(
name = "aarch64-linux-gnu",
target = "aarch64-linux-gnu",
target = "aarch64-linux-gnu.2.17",
)

toolchain(
Expand Down
20 changes: 10 additions & 10 deletions zig/tests/target_platform_test.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,9 @@ def _define_target_platform_test(target, option):
config_settings = {_TARGET_PLATFORM: target},
)

_target_platform_x86_64_linux_test = _define_target_platform_test(_PLATFORM_X86_64_LINUX, "x86_64-linux-gnu")
_target_platform_x86_64_linux_test = _define_target_platform_test(_PLATFORM_X86_64_LINUX, "x86_64-linux-gnu.2.17")
_target_platform_x86_64_linux_musl_test = _define_target_platform_test(_PLATFORM_X86_64_LINUX_MUSL, "x86_64-linux-musl")
_target_platform_aarch64_linux_test = _define_target_platform_test(_PLATFORM_AARCH64_LINUX, "aarch64-linux-gnu")
_target_platform_aarch64_linux_test = _define_target_platform_test(_PLATFORM_AARCH64_LINUX, "aarch64-linux-gnu.2.17")
_target_platform_aarch64_linux_none_test = _define_target_platform_test(_PLATFORM_AARCH64_LINUX_NONE, "aarch64-linux-none")
_target_platform_x86_64_windows_test = _define_target_platform_test(_PLATFORM_X86_64_WINDOWS, "x86_64-windows-gnu")
_target_platform_x86_64_windows_none_test = _define_target_platform_test(_PLATFORM_X86_64_WINDOWS_NONE, "x86_64-windows-none")
Expand All @@ -59,30 +59,30 @@ def _define_build_target_platform_test(mnemonic, target, option):
config_settings = {_TARGET_PLATFORM: target},
)

_build_exe_target_platform_x86_64_linux_test = _define_build_target_platform_test("ZigBuildExe", _PLATFORM_X86_64_LINUX, "x86_64-linux-gnu")
_build_exe_target_platform_x86_64_linux_test = _define_build_target_platform_test("ZigBuildExe", _PLATFORM_X86_64_LINUX, "x86_64-linux-gnu.2.17")
_build_exe_target_platform_x86_64_linux_musl_test = _define_build_target_platform_test("ZigBuildExe", _PLATFORM_X86_64_LINUX_MUSL, "x86_64-linux-musl")
_build_exe_target_platform_aarch64_linux_test = _define_build_target_platform_test("ZigBuildExe", _PLATFORM_AARCH64_LINUX, "aarch64-linux-gnu")
_build_exe_target_platform_aarch64_linux_test = _define_build_target_platform_test("ZigBuildExe", _PLATFORM_AARCH64_LINUX, "aarch64-linux-gnu.2.17")
_build_exe_target_platform_aarch64_linux_none_test = _define_build_target_platform_test("ZigBuildExe", _PLATFORM_AARCH64_LINUX_NONE, "aarch64-linux-none")
_build_exe_target_platform_x86_64_windows_test = _define_build_target_platform_test("ZigBuildExe", _PLATFORM_X86_64_WINDOWS, "x86_64-windows-gnu")
_build_exe_target_platform_x86_64_windows_none_test = _define_build_target_platform_test("ZigBuildExe", _PLATFORM_X86_64_WINDOWS_NONE, "x86_64-windows-none")

_build_lib_target_platform_x86_64_linux_test = _define_build_target_platform_test("ZigBuildLib", _PLATFORM_X86_64_LINUX, "x86_64-linux-gnu")
_build_lib_target_platform_x86_64_linux_test = _define_build_target_platform_test("ZigBuildLib", _PLATFORM_X86_64_LINUX, "x86_64-linux-gnu.2.17")
_build_lib_target_platform_x86_64_linux_musl_test = _define_build_target_platform_test("ZigBuildLib", _PLATFORM_X86_64_LINUX_MUSL, "x86_64-linux-musl")
_build_lib_target_platform_aarch64_linux_test = _define_build_target_platform_test("ZigBuildLib", _PLATFORM_AARCH64_LINUX, "aarch64-linux-gnu")
_build_lib_target_platform_aarch64_linux_test = _define_build_target_platform_test("ZigBuildLib", _PLATFORM_AARCH64_LINUX, "aarch64-linux-gnu.2.17")
_build_lib_target_platform_aarch64_linux_none_test = _define_build_target_platform_test("ZigBuildLib", _PLATFORM_AARCH64_LINUX_NONE, "aarch64-linux-none")
_build_lib_target_platform_x86_64_windows_test = _define_build_target_platform_test("ZigBuildLib", _PLATFORM_X86_64_WINDOWS, "x86_64-windows-gnu")
_build_lib_target_platform_x86_64_windows_none_test = _define_build_target_platform_test("ZigBuildLib", _PLATFORM_X86_64_WINDOWS_NONE, "x86_64-windows-none")

_build_shared_lib_target_platform_x86_64_linux_test = _define_build_target_platform_test("ZigBuildSharedLib", _PLATFORM_X86_64_LINUX, "x86_64-linux-gnu")
_build_shared_lib_target_platform_x86_64_linux_test = _define_build_target_platform_test("ZigBuildSharedLib", _PLATFORM_X86_64_LINUX, "x86_64-linux-gnu.2.17")
_build_shared_lib_target_platform_x86_64_linux_musl_test = _define_build_target_platform_test("ZigBuildSharedLib", _PLATFORM_X86_64_LINUX_MUSL, "x86_64-linux-musl")
_build_shared_lib_target_platform_aarch64_linux_test = _define_build_target_platform_test("ZigBuildSharedLib", _PLATFORM_AARCH64_LINUX, "aarch64-linux-gnu")
_build_shared_lib_target_platform_aarch64_linux_test = _define_build_target_platform_test("ZigBuildSharedLib", _PLATFORM_AARCH64_LINUX, "aarch64-linux-gnu.2.17")
_build_shared_lib_target_platform_aarch64_linux_none_test = _define_build_target_platform_test("ZigBuildSharedLib", _PLATFORM_AARCH64_LINUX_NONE, "aarch64-linux-none")
_build_shared_lib_target_platform_x86_64_windows_test = _define_build_target_platform_test("ZigBuildSharedLib", _PLATFORM_X86_64_WINDOWS, "x86_64-windows-gnu")
_build_shared_lib_target_platform_x86_64_windows_none_test = _define_build_target_platform_test("ZigBuildSharedLib", _PLATFORM_X86_64_WINDOWS_NONE, "x86_64-windows-none")

_build_test_target_platform_x86_64_linux_test = _define_build_target_platform_test("ZigBuildTest", _PLATFORM_X86_64_LINUX, "x86_64-linux-gnu")
_build_test_target_platform_x86_64_linux_test = _define_build_target_platform_test("ZigBuildTest", _PLATFORM_X86_64_LINUX, "x86_64-linux-gnu.2.17")
_build_test_target_platform_x86_64_linux_musl_test = _define_build_target_platform_test("ZigBuildTest", _PLATFORM_X86_64_LINUX_MUSL, "x86_64-linux-musl")
_build_test_target_platform_aarch64_linux_test = _define_build_target_platform_test("ZigBuildTest", _PLATFORM_AARCH64_LINUX, "aarch64-linux-gnu")
_build_test_target_platform_aarch64_linux_test = _define_build_target_platform_test("ZigBuildTest", _PLATFORM_AARCH64_LINUX, "aarch64-linux-gnu.2.17")
_build_test_target_platform_aarch64_linux_none_test = _define_build_target_platform_test("ZigBuildTest", _PLATFORM_AARCH64_LINUX_NONE, "aarch64-linux-none")
_build_test_target_platform_x86_64_windows_test = _define_build_target_platform_test("ZigBuildTest", _PLATFORM_X86_64_WINDOWS, "x86_64-windows-gnu")
_build_test_target_platform_x86_64_windows_none_test = _define_build_target_platform_test("ZigBuildTest", _PLATFORM_X86_64_WINDOWS_NONE, "x86_64-windows-none")
Expand Down