Skip to content

Commit 24a7b63

Browse files
Update runc patch
1 parent c9b6390 commit 24a7b63

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,25 @@
1-
From bcf130f097781d162c0461105a12f4c9f412d3e8 Mon Sep 17 00:00:00 2001
2-
From: Angelos Kolaitis <angelos.kolaitis@canonical.com>
3-
Date: Tue, 20 Feb 2024 12:32:27 +0200
4-
Subject: [PATCH] Disable static PIE on arm64
1+
From c044bd6a172f9d364b8ddad7056a7a3d75e11ddb Mon Sep 17 00:00:00 2001
2+
From: Lucian Petrut <lpetrut@cloudbasesolutions.com>
3+
Date: Fri, 28 Mar 2025 13:01:05 +0000
4+
Subject: [PATCH] [PATCH] Disable static PIE on arm64
55

66
Ubuntu does not currently have the rcrt1.o file on arm64
77
---
88
Makefile | 2 +-
99
1 file changed, 1 insertion(+), 1 deletion(-)
1010

1111
diff --git a/Makefile b/Makefile
12-
index e3af9bc1..b2b07720 100644
12+
index bda0c3a0..b8c1115a 100644
1313
--- a/Makefile
1414
+++ b/Makefile
15-
@@ -33,7 +33,7 @@ LDFLAGS_STATIC := -extldflags -static
15+
@@ -45,7 +45,7 @@ LDFLAGS_STATIC := -extldflags -static
1616
# Enable static PIE executables on supported platforms.
1717
# This (among the other things) requires libc support (rcrt1.o), which seems
1818
# to be available only for arm64 and amd64 (Debian Bullseye).
1919
-ifneq (,$(filter $(GOARCH),arm64 amd64))
2020
+ifneq (,$(filter $(GOARCH),amd64))
21-
ifeq (,$(findstring -race,$(EXTRA_FLAGS)))
22-
GO_BUILDMODE_STATIC := -buildmode=pie
23-
LDFLAGS_STATIC := -linkmode external -extldflags --static-pie
21+
ifeq (,$(findstring -race,$(EXTRA_FLAGS)))
22+
GO_BUILDMODE_STATIC := -buildmode=pie
23+
LDFLAGS_STATIC := -linkmode external -extldflags -static-pie
2424
--
25-
2.34.1
25+
2.43.0

0 commit comments

Comments
 (0)