1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
|
From: Helmut Grohne <helmut@subdivi.de>
Date: Tue, 6 Aug 2019 16:16:05 +0200
Subject: make cross-compilation possible
---
Makefile | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/Makefile b/Makefile
index f908451..62930a4 100644
--- a/Makefile
+++ b/Makefile
@@ -5,6 +5,7 @@ BZERO ?=
MUSL ?= 0
BUNDLED_LIBBSD ?= 0
PLEDGE ?= noop
+PKG_CONFIG ?= pkg-config
WGET ?= wget
libbsd_VERSION ?= 0.10.0
libbsd_BASEURL ?= http://libbsd.freedesktop.org/releases/
@@ -141,13 +142,13 @@ $S: $(libbsd_INCLUDE)/bsd/bsd.h
else
LIBBSD_PKG_VERSION := 0.7
-LIBBSD_PKG_CHECK := $(shell pkg-config libbsd --atleast-version=$(LIBBSD_PKG_VERSION) && echo ok)
+LIBBSD_PKG_CHECK := $(shell $(PKG_CONFIG) libbsd --atleast-version=$(LIBBSD_PKG_VERSION) && echo ok)
ifneq ($(strip $(LIBBSD_PKG_CHECK)),ok)
$(error libbsd is not installed or version is older than $(LIBBSD_PKG_VERSION))
endif
LIBBSD_DEPS :=
-LIBBSD_CFLAGS := $(shell pkg-config libbsd --cflags)
-LIBBSD_LDFLAGS := $(shell pkg-config libbsd --libs)
+LIBBSD_CFLAGS := $(shell $(PKG_CONFIG) libbsd --cflags)
+LIBBSD_LDFLAGS := $(shell $(PKG_CONFIG) libbsd --libs)
endif
@@ -156,8 +157,8 @@ endif
# Git submodule corresponding to libwaive is properly checked out.
#
ifeq ($(PLEDGE),waive)
-SECCOMP_CFLAGS := $(shell pkg-config libseccomp --cflags)
-SECCOMP_LIBS := $(shell pkg-config libseccomp --libs)
+SECCOMP_CFLAGS := $(shell $(PKG_CONFIG) libseccomp --cflags)
+SECCOMP_LIBS := $(shell $(PKG_CONFIG) libseccomp --libs)
CFLAGS += $(SECCOMP_CFLAGS) -pthread
LDFLAGS += $(SECCOMP_LIBS) -pthread
S += libwaive/waive.c
|
