commit: 5718f8440197298e0aa1df2a88a66057d2cdaf83
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 24 17:16:35 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Nov 24 17:16:35 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5718f844
Revert "go-env.eclass: also set GOARM & GO386 when applicable"
This reverts commit 64224abbe06824d47c554dced4149b51f3cebe91.
Ionen raises on the ML that this won't work unless cpu_flags_x86_sse2 is in
IUSE,
so revert for now until can figure that bit out.
Signed-off-by: Sam James <sam <AT> gentoo.org>
eclass/go-env.eclass | 21 ---------------------
1 file changed, 21 deletions(-)
diff --git a/eclass/go-env.eclass b/eclass/go-env.eclass
index 4bc8c4b15c65..08e3cf498a70 100644
--- a/eclass/go-env.eclass
+++ b/eclass/go-env.eclass
@@ -19,8 +19,6 @@ inherit toolchain-funcs
# @FUNCTION: go-env_set_compile_environment
# @DESCRIPTION:
# Set up basic compile environment: CC, CXX, and GOARCH.
-# Necessary platform-specific settings such as GOARM or GO386 are also set
-# according to the Portage configuration when building for those architectures.
# Also carry over CFLAGS, LDFLAGS and friends.
# Required for cross-compiling with crossdev.
# If not set, host defaults will be used and the resulting binaries are host
arch.
@@ -30,9 +28,6 @@ go-env_set_compile_environment() {
tc-export CC CXX
export GOARCH="$(go-env_goarch)"
- use arm && export GOARM=$(go-env_goarm)
- use x86 && export GO386=$(usex cpu_flags_x86_sse2 '' 'softfloat')
-
export CGO_CFLAGS="${CGO_CFLAGS:-$CFLAGS}"
export CGO_CPPFLAGS="${CGO_CPPFLAGS:-$CPPFLAGS}"
export CGO_CXXFLAGS="${CGO_CXXFLAGS:-$CXXFLAGS}"
@@ -62,20 +57,4 @@ go-env_goarch() {
esac
}
-# @FUNCTION: go-env_goarm
-# @USAGE: [CHOST-value]
-# @DESCRIPTION:
-# Returns the appropriate GOARM setting for the CHOST given, or the default
-# CHOST.
-go-env_goarm() {
- case "${1:-${CHOST}}" in
- armv5*) echo 5;;
- armv6*) echo 6;;
- armv7*) echo 7;;
- *)
- die "unknown GOARM for ${1:-${CHOST}}"
- ;;
- esac
-}
-
fi
