Skip to content

Commit 8fc8c17

Browse files
chungthuangjoliveirinha
authored andcommitted
TUN-8146: Fix export path for install-go command
This should fix homebrew-core to use the correct go tool chain
1 parent 8d9aab5 commit 8fc8c17

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

Makefile

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,8 @@ PACKAGE_DIR := $(CURDIR)/packaging
4949
PREFIX := /usr
5050
INSTALL_BINDIR := $(PREFIX)/bin/
5151
INSTALL_MANDIR := $(PREFIX)/share/man/man1/
52+
CF_GO_PATH := /tmp/go
53+
PATH := $(CF_GO_PATH)/bin:$(PATH)
5254

5355
LOCAL_ARCH ?= $(shell uname -m)
5456
ifneq ($(GOARCH),)
@@ -166,12 +168,12 @@ test-ssh-server:
166168

167169
.PHONY: install-go
168170
install-go:
171+
rm -rf ${CF_GO_PATH}
169172
./.teamcity/install-cloudflare-go.sh
170-
export PATH="tmp/go/bin:${PATH}"
171173

172174
.PHONY: cleanup-go
173175
cleanup-go:
174-
rm -rf /tmp/go
176+
rm -rf ${CF_GO_PATH}
175177

176178
cloudflared.1: cloudflared_man_template
177179
sed -e 's/\$${VERSION}/$(VERSION)/; s/\$${DATE}/$(DATE)/' cloudflared_man_template > cloudflared.1

0 commit comments

Comments
 (0)