On Thu, Nov 23, 2023 at 05:31:59PM +0800, WANG Xuerui wrote: > This is necessary for the build artifact to conform to the configured > ISA level and features on those arches. The logic is also taken from > the dev-lang/go ebuild. > > Signed-off-by: WANG Xuerui <[email protected]> > --- > eclass/go-env.eclass | 21 +++++++++++++++++++++ > 1 file changed, 21 insertions(+) > > diff --git a/eclass/go-env.eclass b/eclass/go-env.eclass > index 08e3cf498a70..4bc8c4b15c65 100644 > --- a/eclass/go-env.eclass > +++ b/eclass/go-env.eclass > @@ -19,6 +19,8 @@ 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. > @@ -28,6 +30,9 @@ 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')
cpu_flags_x86_sse2 is not an IUSE_IMPLICIT, meaning that emerging a
package without it in IUSE for x86 will result in:
* ERROR: x11-terms/kitty-0.31.0::gentoo failed (compile phase):
* USE Flag 'cpu_flags_x86_sse2' not in IUSE for x11-terms/kitty-0.31.0
> +
> export CGO_CFLAGS="${CGO_CFLAGS:-$CFLAGS}"
> export CGO_CPPFLAGS="${CGO_CPPFLAGS:-$CPPFLAGS}"
> export CGO_CXXFLAGS="${CGO_CXXFLAGS:-$CXXFLAGS}"
> @@ -57,4 +62,20 @@ 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
> --
> 2.42.1
>
>
--
ionen
signature.asc
Description: PGP signature
