Skip to content

Commit 2d933d7

Browse files
committed
Merge pull request #470 from vdice/no-goos-for-you
fix(client/Makefile): don't export GOOS when running gox
2 parents 4484818 + 57a1433 commit 2d933d7

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

client/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ endif
1212

1313
DEV_ENV_IMAGE := quay.io/deis/go-dev:0.9.0
1414
DEV_ENV_WORK_DIR := /go/src/${repo_path}
15-
DEV_ENV_PREFIX := docker run --rm -e GO15VENDOREXPERIMENT=1 -e CGO_ENABLED=0 -e GOOS=${GOOS} -v ${CURDIR}:${DEV_ENV_WORK_DIR} -w ${DEV_ENV_WORK_DIR}
15+
DEV_ENV_PREFIX := docker run --rm -e GO15VENDOREXPERIMENT=1 -e CGO_ENABLED=0 -v ${CURDIR}:${DEV_ENV_WORK_DIR} -w ${DEV_ENV_WORK_DIR}
1616
DEV_ENV_CMD := ${DEV_ENV_PREFIX} ${DEV_ENV_IMAGE}
1717
DIST_DIR := _dist
1818

@@ -59,7 +59,7 @@ build-all:
5959
-output="$(DIST_DIR)/deis-${VERSION}-{{.OS}}-{{.Arch}}" .
6060

6161
binary-build:
62-
${DEV_ENV_CMD} go build -a -installsuffix cgo -ldflags "-s -X ${repo_path}/version.BuildVersion=${VERSION}" -o deis .
62+
${DEV_ENV_PREFIX} -e GOOS=${GOOS} ${DEV_ENV_IMAGE} go build -a -installsuffix cgo -ldflags "-s -X ${repo_path}/version.BuildVersion=${VERSION}" -o deis .
6363

6464
dist: build-all
6565

0 commit comments

Comments
 (0)