Skip to content

Commit 072ef30

Browse files
ref(makefile): remove GO15VENDOREXPERIMENT as it is no longer necessary in go1.6 (#143)
1 parent 76b60b5 commit 072ef30

1 file changed

Lines changed: 2 additions & 4 deletions

File tree

Makefile

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
export GO15VENDOREXPERIMENT=1
2-
31
# the filepath to this repository, relative to $GOPATH/src
42
repo_path = github.com/deis/workflow-cli
53

@@ -15,8 +13,8 @@ BUILD_ARCH ?=amd64 386
1513

1614
DEV_ENV_IMAGE := quay.io/deis/go-dev:0.14.0
1715
DEV_ENV_WORK_DIR := /go/src/${repo_path}
18-
DEV_ENV_PREFIX := docker run --rm -e GO15VENDOREXPERIMENT=1 -e CGO_ENABLED=0 -v ${CURDIR}:${DEV_ENV_WORK_DIR} -w ${DEV_ENV_WORK_DIR}
19-
DEV_ENV_PREFIX_CGO_ENABLED := docker run --rm -e GO15VENDOREXPERIMENT=1 -e CGO_ENABLED=1 -v ${CURDIR}:${DEV_ENV_WORK_DIR} -w ${DEV_ENV_WORK_DIR}
16+
DEV_ENV_PREFIX := docker run --rm -e CGO_ENABLED=0 -v ${CURDIR}:${DEV_ENV_WORK_DIR} -w ${DEV_ENV_WORK_DIR}
17+
DEV_ENV_PREFIX_CGO_ENABLED := docker run --rm -e CGO_ENABLED=1 -v ${CURDIR}:${DEV_ENV_WORK_DIR} -w ${DEV_ENV_WORK_DIR}
2018
DEV_ENV_CMD := ${DEV_ENV_PREFIX} ${DEV_ENV_IMAGE}
2119
DIST_DIR := _dist
2220

0 commit comments

Comments
 (0)