curben
/
cloudflared-mirror
mirror of https://github.com/cloudflare/cloudflared.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

TUN-8146: Fix export path for install-go command 

This should fix homebrew-core to use the correct go tool chain
This commit is contained in:
Chung-Ting 2024-01-11 10:26:36 +00:00 committed by João Oliveirinha
parent 8d9aab5217
commit 8fc8c17522
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@ -49,6 +49,8 @@ PACKAGE_DIR := $(CURDIR)/packaging
PREFIX := /usr PREFIX := /usr
INSTALL_BINDIR := $(PREFIX)/bin/ INSTALL_BINDIR := $(PREFIX)/bin/
INSTALL_MANDIR := $(PREFIX)/share/man/man1/ INSTALL_MANDIR := $(PREFIX)/share/man/man1/
CF_GO_PATH := /tmp/go
PATH := $(CF_GO_PATH)/bin:$(PATH)
LOCAL_ARCH ?= $(shell uname -m) LOCAL_ARCH ?= $(shell uname -m)
ifneq ($(GOARCH),) ifneq ($(GOARCH),)
@ -166,12 +168,12 @@ test-ssh-server:
.PHONY: install-go .PHONY: install-go
install-go: install-go:
rm -rf ${CF_GO_PATH}
./.teamcity/install-cloudflare-go.sh ./.teamcity/install-cloudflare-go.sh
export PATH="tmp/go/bin:${PATH}"
.PHONY: cleanup-go .PHONY: cleanup-go
cleanup-go: cleanup-go:
rm -rf /tmp/go rm -rf ${CF_GO_PATH}
cloudflared.1: cloudflared_man_template cloudflared.1: cloudflared_man_template
sed -e 's/\$${VERSION}/$(VERSION)/; s/\$${DATE}/$(DATE)/' cloudflared_man_template > cloudflared.1 sed -e 's/\$${VERSION}/$(VERSION)/; s/\$${DATE}/$(DATE)/' cloudflared_man_template > cloudflared.1