From 1375818e7b5b3300812a7e86402526d0b2f72078 Mon Sep 17 00:00:00 2001 From: Sam James Date: Tue, 25 Jun 2024 07:39:53 +0100 Subject: app-containers/docker: don't clobber CGO_* Note that we don't have to export now either as go-env.eclass does that. Bug: https://bugs.gentoo.org/900933 Signed-off-by: Sam James --- app-containers/docker/docker-26.1.0-r1.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'app-containers') diff --git a/app-containers/docker/docker-26.1.0-r1.ebuild b/app-containers/docker/docker-26.1.0-r1.ebuild index 6aec21b30a71..980c31950f3d 100644 --- a/app-containers/docker/docker-26.1.0-r1.ebuild +++ b/app-containers/docker/docker-26.1.0-r1.ebuild @@ -242,8 +242,8 @@ src_compile() { # setup CFLAGS and LDFLAGS for separate build target # see https://github.com/tianon/docker-overlay/pull/10 - export CGO_CFLAGS="-I${ESYSROOT}/usr/include" - export CGO_LDFLAGS="-L${ESYSROOT}/usr/$(get_libdir)" + CGO_CFLAGS+=" -I${ESYSROOT}/usr/include" + CGO_LDFLAGS+=" -L${ESYSROOT}/usr/$(get_libdir)" # let's set up some optional features :) export DOCKER_BUILDTAGS='' -- cgit v1.2.3-65-gdbad