From a969fd904108ed983473277a07bd1b789a78d0ff Mon Sep 17 00:00:00 2001 From: Chen Qi Date: Fri, 3 Feb 2023 00:50:53 -0800 Subject: kubernetes: make CC for amd64 match other architectures Change 0001-hack-lib-golang.sh-use-CC-from-environment.patch to also remove the 'export CC=xxx' for amd64. The original patch is a little strange, it removes such statements for other archs but leaves amd64 untouched. If we're using CC from our environment, we use it for all targets. Signed-off-by: Chen Qi Signed-off-by: Bruce Ashfield --- ...ack-lib-golang.sh-use-CC-from-environment.patch | 25 ++++++++++++++-------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/recipes-containers/kubernetes/kubernetes/0001-hack-lib-golang.sh-use-CC-from-environment.patch b/recipes-containers/kubernetes/kubernetes/0001-hack-lib-golang.sh-use-CC-from-environment.patch index 1c4555a3..c81bd1a4 100644 --- a/recipes-containers/kubernetes/kubernetes/0001-hack-lib-golang.sh-use-CC-from-environment.patch +++ b/recipes-containers/kubernetes/kubernetes/0001-hack-lib-golang.sh-use-CC-from-environment.patch @@ -1,21 +1,25 @@ -From 9cbb2d523d481053d405ebac830c2074b00d3417 Mon Sep 17 00:00:00 2001 +From 116ccf93eef322db23e3bd4f35b12be09ebfbde5 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 23 Jul 2018 15:28:02 +0200 -Subject: [PATCH] hack/lib/golang.sh: use CC from environment +Subject: [PATCH 1/2] hack/lib/golang.sh: use CC from environment Toolchain tupples differs, especially when using vendor provides ones. Upstream-status: Inappropriate [embedded specific] Signed-off-by: Koen Kooi --- - hack/lib/golang.sh | 4 ---- - 1 file changed, 4 deletions(-) + hack/lib/golang.sh | 5 ----- + 1 file changed, 5 deletions(-) -Index: kubernetes-v1.21.1+git45da3fc33872083fb225c1a8c4d03e530d6f7630/hack/lib/golang.sh -=================================================================== ---- kubernetes-v1.21.1+git45da3fc33872083fb225c1a8c4d03e530d6f7630.orig/hack/lib/golang.sh -+++ kubernetes-v1.21.1+git45da3fc33872083fb225c1a8c4d03e530d6f7630/hack/lib/golang.sh -@@ -414,19 +414,15 @@ +diff --git a/hack/lib/golang.sh b/hack/lib/golang.sh +index fb97ee76783..0ed2d719dd1 100755 +--- a/hack/lib/golang.sh ++++ b/hack/lib/golang.sh +@@ -419,23 +419,18 @@ kube::golang::set_platform_envs() { + case "${platform}" in + "linux/amd64") + export CGO_ENABLED=1 +- export CC=${KUBE_LINUX_AMD64_CC:-x86_64-linux-gnu-gcc} ;; "linux/arm") export CGO_ENABLED=1 @@ -35,3 +39,6 @@ Index: kubernetes-v1.21.1+git45da3fc33872083fb225c1a8c4d03e530d6f7630/hack/lib/g ;; esac fi +-- +2.37.1 + -- cgit v1.2.3-54-g00ecf