Skip to content

Commit 7eaacb1

Browse files
committed
Fix recursive expansion in main.mk
thanks to @dpward, suggested in droe/sslsplit@43c3aaf
1 parent 30b3215 commit 7eaacb1

File tree

1 file changed

+15
-7
lines changed

1 file changed

+15
-7
lines changed

Mk/main.mk

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -145,26 +145,25 @@ include $(PROJECT_ROOT)/Mk/xcode.mk
145145
ifneq ($(wildcard /usr/include/libproc.h),)
146146
FEATURES+= -DHAVE_DARWIN_LIBPROC
147147
endif
148-
OSX_VERSION= $(shell sw_vers -productVersion)
148+
OSX_VERSION:= $(shell sw_vers -productVersion)
149+
XNU_HAVE:= $(shell uname -a|sed 's/^.*root:xnu-//g'|sed 's/~.*$$//')
149150
ifneq ($(XNU_VERSION),)
150151
XNU_METHOD= override
151-
XNU_HAVE= $(shell uname -a|sed 's/^.*root:xnu-//g'|sed 's/~.*$$//')
152152
else
153153
XNU_METHOD= uname
154-
XNU_VERSION= $(shell uname -a|sed 's/^.*root:xnu-//g'|sed 's/~.*$$//')
155-
XNU_HAVE:= $(XNU_VERSION)
154+
XNU_VERSION= $(XNU_HAVE)
156155
endif
157156
ifeq ($(wildcard $(PROJECT_ROOT)/xnu/xnu-$(XNU_VERSION)),)
158157
XNU_METHOD= sw_vers
159-
XNU_VERSION= $(shell awk '/^XNU_RELS.*\# $(OSX_VERSION)$$/ {print $$2}' $(PROJECT_ROOT)/xnu/GNUmakefile)
158+
XNU_VERSION:= $(shell awk '/^XNU_RELS.*\# $(OSX_VERSION)$$/ {print $$2}' $(PROJECT_ROOT)/xnu/GNUmakefile)
160159
endif
161160
ifeq ($(wildcard $(PROJECT_ROOT)/xnu/xnu-$(XNU_VERSION)),)
162161
XNU_METHOD= fallback
163-
XNU_VERSION= $(shell awk '/^XNU_RELS/ {print $$2}' $(PROJECT_ROOT)/xnu/GNUmakefile|tail -1)
162+
XNU_VERSION:= $(shell awk '/^XNU_RELS/ {print $$2}' $(PROJECT_ROOT)/xnu/GNUmakefile|tail -1)
164163
endif
165164
ifneq ($(wildcard $(PROJECT_ROOT)/xnu/xnu-$(XNU_VERSION)),)
166165
FEATURES+= -DHAVE_PF
167-
PKG_CPPFLAGS+= -I$(PROJECT_ROOT)/xnu/xnu-$(XNU_VERSION)
166+
CPPFLAGS+= -I$(PROJECT_ROOT)/xnu/xnu-$(XNU_VERSION)
168167
BUILD_INFO+= OSX:$(OSX_VERSION) XNU:$(XNU_VERSION):$(XNU_METHOD):$(XNU_HAVE)
169168
endif
170169
endif
@@ -374,6 +373,10 @@ $(error dependency 'libnet' not found; \
374373
endif
375374
endif
376375

376+
PKG_CFLAGS:=
377+
PKG_CPPFLAGS:=
378+
PKG_LDFLAGS:=
379+
PKG_LIBS:=
377380
ifdef OPENSSL_FOUND
378381
PKG_CPPFLAGS+= -I$(OPENSSL_FOUND)/include
379382
ifneq ($(findstring openssl-3.,$(OPENSSL_FOUND)),openssl-3.)
@@ -413,6 +416,11 @@ PKG_LDFLAGS+= -L$(SQLITE_FOUND)/lib
413416
PKG_LIBS+= -lsqlite3
414417
endif
415418
endif
419+
420+
TPKG_CFLAGS:=
421+
TPKG_CPPFLAGS:=
422+
TPKG_LDFLAGS:=
423+
TPKG_LIBS:=
416424
ifdef CHECK_FOUND
417425
TPKG_CPPFLAGS+= -I$(CHECK_FOUND)/include
418426
TPKG_LDFLAGS+= -L$(CHECK_FOUND)/lib

0 commit comments

Comments
 (0)