From d52d09e57d56d8128b783b72ec389c07e3993d99 Mon Sep 17 00:00:00 2001 From: Areg Vrtanesyan Date: Thu, 24 Jul 2025 10:26:30 +0100 Subject: [PATCH] Fixing conflicts and refreshing FreeBSD build for cloudflared daemon --- Makefile | 7 +++++-- diagnostic/network/collector_unix.go | 2 +- diagnostic/network/collector_unix_test.go | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index e9b411dc..8dfef42a 100644 --- a/Makefile +++ b/Makefile @@ -54,8 +54,11 @@ endif IMPORT_PATH := github.com/cloudflare/cloudflared PACKAGE_DIR := $(CURDIR)/packaging PREFIX := /usr -INSTALL_BINDIR := $(PREFIX)/bin/ -INSTALL_MANDIR := $(PREFIX)/share/man/man1/ +ifeq ($(LOCAL_OS),freebsd) + PREFIX := /usr/local +endif +INSTALL_BINDIR := $(PREFIX)/bin +INSTALL_MANDIR := $(PREFIX)/share/man/man1 LOCAL_ARCH ?= $(shell uname -m) ifneq ($(GOARCH),) diff --git a/diagnostic/network/collector_unix.go b/diagnostic/network/collector_unix.go index 2db2d262..94bfaa15 100644 --- a/diagnostic/network/collector_unix.go +++ b/diagnostic/network/collector_unix.go @@ -1,4 +1,4 @@ -//go:build darwin || linux +//go:build darwin || linux || freebsd package diagnostic diff --git a/diagnostic/network/collector_unix_test.go b/diagnostic/network/collector_unix_test.go index 5ec231a3..5d52c591 100644 --- a/diagnostic/network/collector_unix_test.go +++ b/diagnostic/network/collector_unix_test.go @@ -1,4 +1,4 @@ -//go:build darwin || linux +//go:build darwin || linux || freebsd package diagnostic_test