1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00

Merge pull request #19747 from cpuguy83/nogc

Turn off GC during `make binary`
This commit is contained in:
Jess Frazelle 2016-01-27 15:02:38 -08:00
commit 07312af8fa
2 changed files with 4 additions and 0 deletions

View file

@ -31,12 +31,14 @@ export DOCKERFILE
# `docs/sources/contributing/devenvironment.md ` and `project/PACKAGERS.md` have some limited documentation of some of these # `docs/sources/contributing/devenvironment.md ` and `project/PACKAGERS.md` have some limited documentation of some of these
DOCKER_ENVS := \ DOCKER_ENVS := \
-e BUILDFLAGS \ -e BUILDFLAGS \
-e DOCKER_BUILD_GOGC \
-e DOCKER_BUILD_PKGS \ -e DOCKER_BUILD_PKGS \
-e DOCKER_CLIENTONLY \ -e DOCKER_CLIENTONLY \
-e DOCKER_DEBUG \ -e DOCKER_DEBUG \
-e DOCKER_EXPERIMENTAL \ -e DOCKER_EXPERIMENTAL \
-e DOCKERFILE \ -e DOCKERFILE \
-e DOCKER_GRAPHDRIVER \ -e DOCKER_GRAPHDRIVER \
-e DOCKER_INCREMENTAL_BINARY \
-e DOCKER_REMAP_ROOT \ -e DOCKER_REMAP_ROOT \
-e DOCKER_STORAGE_OPTS \ -e DOCKER_STORAGE_OPTS \
-e DOCKER_USERLANDPROXY \ -e DOCKER_USERLANDPROXY \

View file

@ -8,6 +8,8 @@ BINARY_FULLNAME="$BINARY_NAME$BINARY_EXTENSION"
source "${MAKEDIR}/.go-autogen" source "${MAKEDIR}/.go-autogen"
( (
export GOGC=${DOCKER_BUILD_GOGC:-1000}
if [ "$(go env GOOS)/$(go env GOARCH)" != "$(go env GOHOSTOS)/$(go env GOHOSTARCH)" ]; then if [ "$(go env GOOS)/$(go env GOARCH)" != "$(go env GOHOSTOS)/$(go env GOHOSTARCH)" ]; then
# must be cross-compiling! # must be cross-compiling!
case "$(go env GOOS)/$(go env GOARCH)" in case "$(go env GOOS)/$(go env GOARCH)" in