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

Fixing conflicts and refreshing FreeBSD build for cloudflared daemon

This commit is contained in:
Areg Vrtanesyan 2025-07-24 10:26:30 +01:00
parent 1cedefa1c2
commit d52d09e57d
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Makefile
View File

@ -54,8 +54,11 @@ endif
IMPORT_PATH := github.com/cloudflare/cloudflared IMPORT_PATH := github.com/cloudflare/cloudflared
PACKAGE_DIR := $(CURDIR)/packaging PACKAGE_DIR := $(CURDIR)/packaging
PREFIX := /usr PREFIX := /usr
INSTALL_BINDIR := $(PREFIX)/bin/ ifeq ($(LOCAL_OS),freebsd)
INSTALL_MANDIR := $(PREFIX)/share/man/man1/ PREFIX := /usr/local
endif
INSTALL_BINDIR := $(PREFIX)/bin
INSTALL_MANDIR := $(PREFIX)/share/man/man1
LOCAL_ARCH ?= $(shell uname -m) LOCAL_ARCH ?= $(shell uname -m)
ifneq ($(GOARCH),) ifneq ($(GOARCH),)

2
diagnostic/network/collector_unix.go
View File

@ -1,4 +1,4 @@
//go:build darwin || linux //go:build darwin || linux || freebsd
package diagnostic package diagnostic

2
diagnostic/network/collector_unix_test.go
View File

@ -1,4 +1,4 @@
//go:build darwin || linux //go:build darwin || linux || freebsd
package diagnostic_test package diagnostic_test