From 45879c73601b9b60c9c06beb4cf8e18f0ceb3cbb Mon Sep 17 00:00:00 2001 From: Malte Poll <1780588+malt3@users.noreply.github.com> Date: Thu, 23 Nov 2023 17:12:54 +0100 Subject: [PATCH] bazel: use pure Go platform where possible Before, we specified that the platform has glibc 2.23 under /usr/lib. This is technically not important for statically linked Go binaries. --- debugd/cmd/debugd/BUILD.bazel | 11 +++++------ measurement-reader/cmd/BUILD.bazel | 13 +++++++------ upgrade-agent/cmd/BUILD.bazel | 11 +++++------ 3 files changed, 17 insertions(+), 18 deletions(-) diff --git a/debugd/cmd/debugd/BUILD.bazel b/debugd/cmd/debugd/BUILD.bazel index 40d946f36..5f4e716e4 100644 --- a/debugd/cmd/debugd/BUILD.bazel +++ b/debugd/cmd/debugd/BUILD.bazel @@ -1,7 +1,6 @@ -load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library") +load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_cross_binary", "go_library") load("@rules_pkg//:pkg.bzl", "pkg_tar") load("@rules_pkg//pkg:mappings.bzl", "pkg_files") -load("//bazel/go:platform.bzl", "platform_binary") go_library( name = "debugd_lib", @@ -38,10 +37,10 @@ go_binary( visibility = ["//visibility:public"], ) -platform_binary( +go_cross_binary( name = "debugd_linux_amd64", - platform = "@zig_sdk//libc_aware/platform:linux_amd64_gnu.2.23", - target_file = ":debugd", + platform = "//bazel/platforms:go-pure_x86_64-linux", + target = ":debugd", visibility = ["//visibility:public"], ) @@ -61,6 +60,6 @@ pkg_tar( ":debugd_unit", ], mode = "0755", - remap_paths = {"/platform:linux_amd64_gnu.2.23": "/usr/bin/debugd"}, + remap_paths = {"/debugd_linux_amd64": "/usr/bin/debugd"}, visibility = ["//visibility:public"], ) diff --git a/measurement-reader/cmd/BUILD.bazel b/measurement-reader/cmd/BUILD.bazel index 9f9d10257..db81ce3d9 100644 --- a/measurement-reader/cmd/BUILD.bazel +++ b/measurement-reader/cmd/BUILD.bazel @@ -1,6 +1,5 @@ -load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library") +load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_cross_binary", "go_library") load("@rules_pkg//:pkg.bzl", "pkg_tar") -load("//bazel/go:platform.bzl", "platform_binary") go_library( name = "cmd_lib", @@ -22,13 +21,15 @@ go_library( go_binary( name = "cmd", embed = [":cmd_lib"], + # keep + pure = "on", visibility = ["//visibility:public"], ) -platform_binary( +go_cross_binary( name = "measurement-reader_linux_amd64", - platform = "@zig_sdk//libc_aware/platform:linux_amd64_gnu.2.23", - target_file = ":cmd", + platform = "//bazel/platforms:go-pure_x86_64-linux", + target = ":cmd", visibility = ["//visibility:public"], ) @@ -38,6 +39,6 @@ pkg_tar( ":measurement-reader_linux_amd64", ], mode = "0755", - remap_paths = {"/platform:linux_amd64_gnu.2.23": "/usr/sbin/measurement-reader"}, + remap_paths = {"/measurement-reader_linux_amd64": "/usr/sbin/measurement-reader"}, visibility = ["//visibility:public"], ) diff --git a/upgrade-agent/cmd/BUILD.bazel b/upgrade-agent/cmd/BUILD.bazel index 8f1694cfe..ea7b3e2d3 100644 --- a/upgrade-agent/cmd/BUILD.bazel +++ b/upgrade-agent/cmd/BUILD.bazel @@ -1,6 +1,5 @@ -load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library") +load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_cross_binary", "go_library") load("@rules_pkg//:pkg.bzl", "pkg_tar") -load("//bazel/go:platform.bzl", "platform_binary") go_library( name = "cmd_lib", @@ -25,10 +24,10 @@ go_binary( visibility = ["//visibility:public"], ) -platform_binary( +go_cross_binary( name = "upgrade_agent_linux_amd64", - platform = "@zig_sdk//libc_aware/platform:linux_amd64_gnu.2.23", - target_file = ":cmd", + platform = "//bazel/platforms:go-pure_x86_64-linux", + target = ":cmd", visibility = ["//visibility:public"], ) @@ -38,6 +37,6 @@ pkg_tar( ":upgrade_agent_linux_amd64", ], mode = "0755", - remap_paths = {"/platform:linux_amd64_gnu.2.23": "/usr/bin/upgrade-agent"}, + remap_paths = {"/upgrade_agent_linux_amd64": "/usr/bin/upgrade-agent"}, visibility = ["//visibility:public"], )