Skip to content

Commit 37ec2d4

Browse files
committed
TUN-8134: Install cloudflare go as part of make install
To build cloudflared from source, one will need a go tool chain that supports post quantum curves
1 parent ecd101d commit 37ec2d4

File tree

1 file changed

+11
-2
lines changed

1 file changed

+11
-2
lines changed

Makefile

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ endif
4646

4747
IMPORT_PATH := github.com/cloudflare/cloudflared
4848
PACKAGE_DIR := $(CURDIR)/packaging
49-
PREFIX := /usr
49+
PREFIX := /usr/local
5050
INSTALL_BINDIR := $(PREFIX)/bin/
5151
INSTALL_MANDIR := $(PREFIX)/share/man/man1/
5252

@@ -164,10 +164,19 @@ cover:
164164
test-ssh-server:
165165
docker-compose -f ssh_server_tests/docker-compose.yml up
166166

167+
.PHONY: install-go
168+
install-go:
169+
./.teamcity/install-cloudflare-go.sh
170+
export PATH="tmp/go/bin:${PATH}"
171+
172+
.PHONY: cleanup-go
173+
cleanup-go:
174+
rm -rf /tmp/go
175+
167176
cloudflared.1: cloudflared_man_template
168177
sed -e 's/\$${VERSION}/$(VERSION)/; s/\$${DATE}/$(DATE)/' cloudflared_man_template > cloudflared.1
169178

170-
install: cloudflared cloudflared.1
179+
install: install-go cloudflared cloudflared.1 cleanup-go
171180
mkdir -p $(DESTDIR)$(INSTALL_BINDIR) $(DESTDIR)$(INSTALL_MANDIR)
172181
install -m755 cloudflared $(DESTDIR)$(INSTALL_BINDIR)/cloudflared
173182
install -m644 cloudflared.1 $(DESTDIR)$(INSTALL_MANDIR)/cloudflared.1

0 commit comments

Comments
 (0)