Fixing conflicts and refreshing FreeBSD build for cloudflared daemon
This commit is contained in:
parent
1cedefa1c2
commit
d52d09e57d
7
Makefile
7
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),)
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
//go:build darwin || linux
|
||||
//go:build darwin || linux || freebsd
|
||||
|
||||
package diagnostic
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
//go:build darwin || linux
|
||||
//go:build darwin || linux || freebsd
|
||||
|
||||
package diagnostic_test
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue