Remove gccgo support
Since Go 1.7, s390x uses upstream Go, so we have no reason to support gccgo any more. Signed-off-by: Justin Cormack <justin.cormack@docker.com> Upstream-commit: eda90f63446253f97d2011926555306f2417d208 Component: engine
This commit is contained in:
@ -3,7 +3,7 @@
|
||||
# see test-integration-cli for example usage of this script
|
||||
|
||||
base="$ABS_DEST/.."
|
||||
export PATH="$base/binary-client:$base/binary-daemon:$base/dynbinary-client:$base/dynbinary-daemon:$base/gccgo:$base/dyngccgo:$PATH"
|
||||
export PATH="$base/binary-client:$base/binary-daemon:$base/dynbinary-client:$base/dynbinary-daemon:$PATH"
|
||||
|
||||
if ! command -v docker &> /dev/null; then
|
||||
echo >&2 'error: binary-client or dynbinary-client must be run before .integration-daemon-start'
|
||||
|
||||
@ -1,11 +0,0 @@
|
||||
#!/bin/bash
|
||||
set -e
|
||||
|
||||
(
|
||||
export IAMSTATIC="false"
|
||||
export EXTLDFLAGS_STATIC=''
|
||||
export LDFLAGS_STATIC_DOCKER=''
|
||||
export BUILDFLAGS=( "${BUILDFLAGS[@]/netgo /}" ) # disable netgo, since we don't need it for a dynamic binary
|
||||
export BUILDFLAGS=( "${BUILDFLAGS[@]/static_build /}" ) # we're not building a "static" binary here
|
||||
source "${MAKEDIR}/gccgo"
|
||||
)
|
||||
@ -1,68 +0,0 @@
|
||||
#!/bin/bash
|
||||
set -e
|
||||
|
||||
BINARY_NAME="dockerd-$VERSION"
|
||||
BINARY_EXTENSION="$(binary_extension)"
|
||||
BINARY_FULLNAME="$BINARY_NAME$BINARY_EXTENSION"
|
||||
|
||||
PROXY_NAME="docker-proxy-$VERSION"
|
||||
PROXY_FULLNAME="$PROXY_NAME$BINARY_EXTENSION"
|
||||
|
||||
CLIENTBIN_NAME="docker-$VERSION"
|
||||
CLIENTBIN_FULLNAME="$CLIENTBIN_NAME$BINARY_EXTENSION"
|
||||
|
||||
source "${MAKEDIR}/.go-autogen"
|
||||
|
||||
if [[ "${BUILDFLAGS[@]}" =~ 'netgo ' ]]; then
|
||||
EXTLDFLAGS_STATIC+=' -lnetgo'
|
||||
fi
|
||||
# gccgo require explicit flag -pthread to allow goroutines to work.
|
||||
go build -compiler=gccgo \
|
||||
-o "$DEST/$BINARY_FULLNAME" \
|
||||
"${BUILDFLAGS[@]}" \
|
||||
-gccgoflags "
|
||||
-g
|
||||
$EXTLDFLAGS_STATIC
|
||||
-Wl,--no-export-dynamic
|
||||
-ldl
|
||||
-pthread
|
||||
" \
|
||||
./cmd/dockerd
|
||||
|
||||
echo "Created binary: $DEST/$BINARY_FULLNAME"
|
||||
ln -sf "$BINARY_FULLNAME" "$DEST/dockerd$BINARY_EXTENSION"
|
||||
|
||||
go build -compiler=gccgo \
|
||||
-o "$DEST/$PROXY_FULLNAME" \
|
||||
"${BUILDFLAGS[@]}" \
|
||||
-gccgoflags "
|
||||
-g
|
||||
$EXTLDFLAGS_STATIC
|
||||
-Wl,--no-export-dynamic
|
||||
-ldl
|
||||
-pthread
|
||||
" \
|
||||
./vendor/src/github.com/docker/libnetwork/cmd/proxy
|
||||
|
||||
echo "Created binary: $DEST/$PROXY_FULLNAME"
|
||||
ln -sf "$PROXY_FULLNAME" "$DEST/docker-proxy$BINARY_EXTENSION"
|
||||
|
||||
copy_containerd "$DEST" "hash"
|
||||
hash_files "$DEST/$BINARY_FULLNAME"
|
||||
|
||||
go build -compiler=gccgo \
|
||||
-o "$DEST/$CLIENTBIN_FULLNAME" \
|
||||
"${BUILDFLAGS[@]}" \
|
||||
-gccgoflags "
|
||||
-g
|
||||
$EXTLDFLAGS_STATIC
|
||||
-Wl,--no-export-dynamic
|
||||
-ldl
|
||||
-pthread
|
||||
" \
|
||||
./cmd/docker
|
||||
|
||||
echo "Created binary: $DEST/$CLIENTBIN_FULLNAME"
|
||||
ln -sf "$CLIENTBIN_FULLNAME" "$DEST/docker$BINARY_EXTENSION"
|
||||
hash_files "$DEST/$CLIENTBIN_FULLNAME"
|
||||
|
||||
@ -34,13 +34,9 @@ bundle_test_unit() {
|
||||
| grep -v github.com/docker/docker/vendor \
|
||||
| grep -v github.com/docker/docker/man \
|
||||
| grep -v github.com/docker/docker/integration-cli)
|
||||
go test $COVER $GCCGOFLAGS -ldflags "$LDFLAGS" "${BUILDFLAGS[@]}" $TESTFLAGS $pkg_list
|
||||
go test $COVER -ldflags "$LDFLAGS" "${BUILDFLAGS[@]}" $TESTFLAGS $pkg_list
|
||||
}
|
||||
|
||||
COVER=-cover
|
||||
|
||||
if [[ "$(go version)" == *"gccgo"* ]]; then
|
||||
GCCGOFLAGS=-gccgoflags="-lpthread"
|
||||
else
|
||||
COVER=-cover
|
||||
fi
|
||||
bundle_test_unit 2>&1 | tee -a "$DEST/test.log"
|
||||
|
||||
Reference in New Issue
Block a user