From a46a1cdc12b597402cd38790ce6d0c0525e68c30 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lucas=20K=C3=A4ldstr=C3=B6m?= Date: Mon, 30 May 2016 23:59:34 +0300 Subject: [PATCH] Don't set the env var CC when not cross-compiling --- hack/lib/golang.sh | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/hack/lib/golang.sh b/hack/lib/golang.sh index b8bfabceb83..0379d4b08dc 100755 --- a/hack/lib/golang.sh +++ b/hack/lib/golang.sh @@ -166,6 +166,7 @@ readonly KUBE_STATIC_LIBRARIES=( kube-proxy kubectl federation-apiserver + federation-controller-manager ) kube::golang::is_statically_linked_library() { @@ -225,17 +226,21 @@ kube::golang::set_platform_envs() { export GOOS=${platform%/*} export GOARCH=${platform##*/} - # Dynamic CGO linking for other server architectures than linux/amd64 goes here - # If you want to include support for more server platforms than these, add arch-specific gcc names here - if [[ ${platform} == "linux/arm" ]]; then - export CGO_ENABLED=1 - export CC=arm-linux-gnueabi-gcc - elif [[ ${platform} == "linux/arm64" ]]; then - export CGO_ENABLED=1 - export CC=aarch64-linux-gnu-gcc - elif [[ ${platform} == "linux/ppc64le" ]]; then - export CGO_ENABLED=1 - export CC=powerpc64le-linux-gnu-gcc + # Do not set CC when building natively on a platform, only if cross-compiling from linux/amd64 + if [[ $(kube::golang::host_platform) == "linux/amd64" ]]; then + + # Dynamic CGO linking for other server architectures than linux/amd64 goes here + # If you want to include support for more server platforms than these, add arch-specific gcc names here + if [[ ${platform} == "linux/arm" ]]; then + export CGO_ENABLED=1 + export CC=arm-linux-gnueabi-gcc + elif [[ ${platform} == "linux/arm64" ]]; then + export CGO_ENABLED=1 + export CC=aarch64-linux-gnu-gcc + elif [[ ${platform} == "linux/ppc64le" ]]; then + export CGO_ENABLED=1 + export CC=powerpc64le-linux-gnu-gcc + fi fi }