mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-08-06 23:27:04 +02:00
Code Issues Projects Releases Wiki Activity

BUILD: makefile: support USE_xxx=0 as well

Browse Source 
William rightfully reported that not supporting =0 to disable a USE_xxx
option is sometimes painful (e.g. a script might do USE_xxx=$(command)).
It's not that difficult to handle actually, we just need to consider the
value 0 as empty at the few places that test for an empty string in
options.mk, and in each "ifneq" test in the main Makefile, so let's do
that. We even take care of preserving the original value in the build
options string so that building with USE_OPENSSL=0 will be reported
as-is in haproxy -vv, and with "-OPENSSL" in the feature list.
This commit is contained in:
Willy Tarreau 2024-04-11 10:41:39 +02:00
parent aa32ab13f0
commit d78c346670
3 changed files with 58 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
INSTALL
View File

@ -73,10 +73,10 @@ can use a relatively similar one and adjust specific variables by hand.
Most configuration variables are in fact booleans. Some options are detected and Most configuration variables are in fact booleans. Some options are detected and
enabled by default if available on the target platform. This is the case for all enabled by default if available on the target platform. This is the case for all
those named "USE_<feature>". These booleans are enabled by "USE_<feature>=1" those named "USE_<feature>". These booleans are enabled by "USE_<feature>=1"
and are disabled by "USE_<feature>=" (with no value). An exhaustive list of the and are disabled by "USE_<feature>=" (with no value) or "USE_<feature>=0". An
supported USE_* features is located at the top of the main Makefile. The last exhaustive list of the supported USE_* features is located at the top of the
occurrence of such an option on the command line overrides any previous one. main Makefile. The last occurrence of such an option on the command line
Example : overrides any previous one. Example :
$ make TARGET=generic USE_THREAD= $ make TARGET=generic USE_THREAD=
@ -749,9 +749,10 @@ multithreading via USE_THREAD.
You can easily define your own target with the GNU Makefile. Unknown targets You can easily define your own target with the GNU Makefile. Unknown targets
are processed with no default option except USE_POLL=default. So you can very are processed with no default option except USE_POLL=default. So you can very
well use that property to define your own set of options. USE_POLL and USE_SLZ well use that property to define your own set of options. USE_POLL and USE_SLZ
can even be disabled by setting them to an empty string. For example : can even be disabled by setting them to an empty string or a zero. For
example :
$ gmake TARGET=tiny USE_POLL="" USE_SLZ="" TARGET_CFLAGS=-fomit-frame-pointer $ gmake TARGET=tiny USE_POLL="" USE_SLZ=0 TARGET_CFLAGS=-fomit-frame-pointer
If you need to pass some defines to the preprocessor or compiler, you may pass If you need to pass some defines to the preprocessor or compiler, you may pass
them all in the DEFINE variable. Example: them all in the DEFINE variable. Example:

90
Makefile
View File

@ -333,7 +333,7 @@ USE_POLL = default
# SLZ is always supported unless explicitly disabled by passing USE_SLZ="" # SLZ is always supported unless explicitly disabled by passing USE_SLZ=""
# or disabled by enabling ZLIB using USE_ZLIB=1 # or disabled by enabling ZLIB using USE_ZLIB=1
ifeq ($(USE_ZLIB),) ifeq ($(USE_ZLIB:0=),)
USE_SLZ = default USE_SLZ = default
endif endif
@ -470,7 +470,7 @@ $(set_target_defaults)
# any occurrence of 1 indicates libatomic is necessary. It's better to avoid # any occurrence of 1 indicates libatomic is necessary. It's better to avoid
# linking with it by default as it's not always available nor deployed # linking with it by default as it's not always available nor deployed
# (especially on archs which do not need it). # (especially on archs which do not need it).
ifneq ($(USE_THREAD),) ifneq ($(USE_THREAD:0=),)
ifneq ($(shell $(CC) $(CFLAGS) -dM -E -xc - </dev/null 2>/dev/null | grep -c 'LOCK_FREE.*1'),0) ifneq ($(shell $(CC) $(CFLAGS) -dM -E -xc - </dev/null 2>/dev/null | grep -c 'LOCK_FREE.*1'),0)
USE_LIBATOMIC = implicit USE_LIBATOMIC = implicit
endif endif
@ -522,7 +522,7 @@ BUILD_OPTIONS := $(call build_options)
# possibly be unused though) # possibly be unused though)
OPTIONS_CFLAGS += $(call opts_as_defines) OPTIONS_CFLAGS += $(call opts_as_defines)
ifneq ($(USE_LIBCRYPT),) ifneq ($(USE_LIBCRYPT:0=),)
ifneq ($(TARGET),openbsd) ifneq ($(TARGET),openbsd)
ifneq ($(TARGET),osx) ifneq ($(TARGET),osx)
LIBCRYPT_LDFLAGS = -lcrypt LIBCRYPT_LDFLAGS = -lcrypt
@ -530,45 +530,45 @@ ifneq ($(USE_LIBCRYPT),)
endif endif
endif endif
ifneq ($(USE_ZLIB),) ifneq ($(USE_ZLIB:0=),)
# Use ZLIB_INC and ZLIB_LIB to force path to zlib.h and libz.{a,so} if needed. # Use ZLIB_INC and ZLIB_LIB to force path to zlib.h and libz.{a,so} if needed.
ZLIB_CFLAGS = $(if $(ZLIB_INC),-I$(ZLIB_INC)) ZLIB_CFLAGS = $(if $(ZLIB_INC),-I$(ZLIB_INC))
ZLIB_LDFLAGS = $(if $(ZLIB_LIB),-L$(ZLIB_LIB)) -lz ZLIB_LDFLAGS = $(if $(ZLIB_LIB),-L$(ZLIB_LIB)) -lz
endif endif
ifneq ($(USE_SLZ),) ifneq ($(USE_SLZ:0=),)
OPTIONS_OBJS += src/slz.o OPTIONS_OBJS += src/slz.o
endif endif
ifneq ($(USE_POLL),) ifneq ($(USE_POLL:0=),)
OPTIONS_OBJS += src/ev_poll.o OPTIONS_OBJS += src/ev_poll.o
endif endif
ifneq ($(USE_EPOLL),) ifneq ($(USE_EPOLL:0=),)
OPTIONS_OBJS += src/ev_epoll.o OPTIONS_OBJS += src/ev_epoll.o
endif endif
ifneq ($(USE_KQUEUE),) ifneq ($(USE_KQUEUE:0=),)
OPTIONS_OBJS += src/ev_kqueue.o OPTIONS_OBJS += src/ev_kqueue.o
endif endif
ifneq ($(USE_EVPORTS),) ifneq ($(USE_EVPORTS:0=),)
OPTIONS_OBJS += src/ev_evports.o OPTIONS_OBJS += src/ev_evports.o
endif endif
ifneq ($(USE_RT),) ifneq ($(USE_RT:0=),)
RT_LDFLAGS = -lrt RT_LDFLAGS = -lrt
endif endif
ifneq ($(USE_THREAD),) ifneq ($(USE_THREAD:0=),)
THREAD_LDFLAGS = -pthread THREAD_LDFLAGS = -pthread
endif endif
ifneq ($(USE_BACKTRACE),) ifneq ($(USE_BACKTRACE:0=),)
BACKTRACE_LDFLAGS = -Wl,$(if $(EXPORT_SYMBOL),$(EXPORT_SYMBOL),--export-dynamic) BACKTRACE_LDFLAGS = -Wl,$(if $(EXPORT_SYMBOL),$(EXPORT_SYMBOL),--export-dynamic)
endif endif
ifneq ($(USE_CPU_AFFINITY),) ifneq ($(USE_CPU_AFFINITY:0=),)
OPTIONS_OBJS += src/cpuset.o OPTIONS_OBJS += src/cpuset.o
endif endif
@ -580,32 +580,32 @@ endif
# This is for the WolfSSL variant of the OpenSSL API. Setting it implies # This is for the WolfSSL variant of the OpenSSL API. Setting it implies
# OPENSSL so it's not necessary to set the latter. # OPENSSL so it's not necessary to set the latter.
ifneq ($(USE_OPENSSL_WOLFSSL),) ifneq ($(USE_OPENSSL_WOLFSSL:0=),)
SSL_CFLAGS := $(if $(SSL_INC),-I$(SSL_INC)/wolfssl -I$(SSL_INC)) SSL_CFLAGS := $(if $(SSL_INC),-I$(SSL_INC)/wolfssl -I$(SSL_INC))
SSL_LDFLAGS := $(if $(SSL_LIB),-L$(SSL_LIB)) -lwolfssl SSL_LDFLAGS := $(if $(SSL_LIB),-L$(SSL_LIB)) -lwolfssl
# always automatically set USE_OPENSSL # always automatically set USE_OPENSSL
USE_OPENSSL := $(if $(USE_OPENSSL),$(USE_OPENSSL),implicit) USE_OPENSSL := $(if $(USE_OPENSSL:0=),$(USE_OPENSSL:0=),implicit)
endif endif
# This is for the AWS-LC variant of the OpenSSL API. Setting it implies # This is for the AWS-LC variant of the OpenSSL API. Setting it implies
# OPENSSL so it's not necessary to set the latter. # OPENSSL so it's not necessary to set the latter.
ifneq ($(USE_OPENSSL_AWSLC),) ifneq ($(USE_OPENSSL_AWSLC:0=),)
# always automatically set USE_OPENSSL # always automatically set USE_OPENSSL
USE_OPENSSL := $(if $(USE_OPENSSL),$(USE_OPENSSL),implicit) USE_OPENSSL := $(if $(USE_OPENSSL:0=),$(USE_OPENSSL:0=),implicit)
endif endif
# This is for any variant of the OpenSSL API. By default it uses OpenSSL. # This is for any variant of the OpenSSL API. By default it uses OpenSSL.
ifneq ($(USE_OPENSSL),) ifneq ($(USE_OPENSSL:0=),)
# only preset these for the regular openssl # only preset these for the regular openssl
ifeq ($(USE_OPENSSL_WOLFSSL),) ifeq ($(USE_OPENSSL_WOLFSSL:0=),)
SSL_CFLAGS := $(if $(SSL_INC),-I$(SSL_INC)) SSL_CFLAGS := $(if $(SSL_INC),-I$(SSL_INC))
SSL_LDFLAGS := $(if $(SSL_LIB),-L$(SSL_LIB)) -lssl -lcrypto SSL_LDFLAGS := $(if $(SSL_LIB),-L$(SSL_LIB)) -lssl -lcrypto
endif endif
USE_SSL := $(if $(USE_SSL),$(USE_SSL),implicit) USE_SSL := $(if $(USE_SSL:0=),$(USE_SSL:0=),implicit)
OPTIONS_OBJS += src/ssl_sock.o src/ssl_ckch.o src/ssl_sample.o src/ssl_crtlist.o src/cfgparse-ssl.o src/ssl_utils.o src/jwt.o src/ssl_ocsp.o src/ssl_gencert.o OPTIONS_OBJS += src/ssl_sock.o src/ssl_ckch.o src/ssl_sample.o src/ssl_crtlist.o src/cfgparse-ssl.o src/ssl_utils.o src/jwt.o src/ssl_ocsp.o src/ssl_gencert.o
endif endif
ifneq ($(USE_ENGINE),) ifneq ($(USE_ENGINE:0=),)
# OpenSSL 3.0 emits loud deprecation warnings by default when building with # OpenSSL 3.0 emits loud deprecation warnings by default when building with
# engine support, and this option is made to silence them. Better use it # engine support, and this option is made to silence them. Better use it
# only when absolutely necessary, until there's a viable alternative to the # only when absolutely necessary, until there's a viable alternative to the
@ -613,7 +613,7 @@ ifneq ($(USE_ENGINE),)
ENGINE_CFLAGS = -DOPENSSL_SUPPRESS_DEPRECATED ENGINE_CFLAGS = -DOPENSSL_SUPPRESS_DEPRECATED
endif endif
ifneq ($(USE_QUIC),) ifneq ($(USE_QUIC:0=),)
OPTIONS_OBJS += src/quic_conn.o src/mux_quic.o src/h3.o src/xprt_quic.o \ OPTIONS_OBJS += src/quic_conn.o src/mux_quic.o src/h3.o src/xprt_quic.o \
src/quic_frame.o src/quic_tls.o src/quic_tp.o \ src/quic_frame.o src/quic_tls.o src/quic_tp.o \
src/quic_stats.o src/quic_sock.o src/proto_quic.o \ src/quic_stats.o src/quic_sock.o src/proto_quic.o \
@ -627,11 +627,11 @@ OPTIONS_OBJS += src/quic_conn.o src/mux_quic.o src/h3.o src/xprt_quic.o \
src/quic_retransmit.o src/quic_fctl.o src/quic_retransmit.o src/quic_fctl.o
endif endif
ifneq ($(USE_QUIC_OPENSSL_COMPAT),) ifneq ($(USE_QUIC_OPENSSL_COMPAT:0=),)
OPTIONS_OBJS += src/quic_openssl_compat.o OPTIONS_OBJS += src/quic_openssl_compat.o
endif endif
ifneq ($(USE_LUA),) ifneq ($(USE_LUA:0=),)
check_lua_inc = $(shell if [ -d $(2)$(1) ]; then echo $(2)$(1); fi;) check_lua_inc = $(shell if [ -d $(2)$(1) ]; then echo $(2)$(1); fi;)
LUA_INC := $(firstword $(foreach lib,lua5.4 lua54 lua5.3 lua53 lua,$(call check_lua_inc,$(lib),"/usr/include/"))) LUA_INC := $(firstword $(foreach lib,lua5.4 lua54 lua5.3 lua53 lua,$(call check_lua_inc,$(lib),"/usr/include/")))
@ -664,12 +664,12 @@ ifneq ($(USE_LUA),)
OPTIONS_OBJS += src/hlua.o src/hlua_fcn.o OPTIONS_OBJS += src/hlua.o src/hlua_fcn.o
endif # USE_LUA endif # USE_LUA
ifneq ($(USE_PROMEX),) ifneq ($(USE_PROMEX:0=),)
OPTIONS_OBJS += addons/promex/service-prometheus.o OPTIONS_OBJS += addons/promex/service-prometheus.o
PROMEX_CFLAGS = -Iaddons/promex/include PROMEX_CFLAGS = -Iaddons/promex/include
endif endif
ifneq ($(USE_DEVICEATLAS),) ifneq ($(USE_DEVICEATLAS:0=),)
# Use DEVICEATLAS_SRC and possibly DEVICEATLAS_INC and DEVICEATLAS_LIB to force path # Use DEVICEATLAS_SRC and possibly DEVICEATLAS_INC and DEVICEATLAS_LIB to force path
# to DeviceAtlas headers and libraries if needed. In this context, DEVICEATLAS_NOCACHE # to DeviceAtlas headers and libraries if needed. In this context, DEVICEATLAS_NOCACHE
# can be used to disable the cache support if needed (this also removes the necessity of having # can be used to disable the cache support if needed (this also removes the necessity of having
@ -689,12 +689,12 @@ endif
51DEGREES_LIB = $(51DEGREES_SRC) 51DEGREES_LIB = $(51DEGREES_SRC)
51DEGREES_VER = 3 51DEGREES_VER = 3
ifneq ($(USE_51DEGREES),) ifneq ($(USE_51DEGREES:0=),)
ifeq ($(51DEGREES_VER),4) # v4 here ifeq ($(51DEGREES_VER),4) # v4 here
_51DEGREES_SRC = $(shell find $(51DEGREES_LIB) -maxdepth 2 -name '*.c') _51DEGREES_SRC = $(shell find $(51DEGREES_LIB) -maxdepth 2 -name '*.c')
OPTIONS_OBJS += $(_51DEGREES_SRC:%.c=%.o) OPTIONS_OBJS += $(_51DEGREES_SRC:%.c=%.o)
51DEGREES_CFLAGS += -DUSE_51DEGREES_V4 51DEGREES_CFLAGS += -DUSE_51DEGREES_V4
ifeq ($(USE_THREAD),) ifeq ($(USE_THREAD:0=),)
51DEGREES_CFLAGS += -DFIFTYONEDEGREES_NO_THREADING -DFIFTYONE_DEGREES_NO_THREADING 51DEGREES_CFLAGS += -DFIFTYONEDEGREES_NO_THREADING -DFIFTYONE_DEGREES_NO_THREADING
endif endif
USE_LIBATOMIC = implicit USE_LIBATOMIC = implicit
@ -703,7 +703,7 @@ ifneq ($(USE_51DEGREES),)
ifeq ($(51DEGREES_VER),3) # v3 here ifeq ($(51DEGREES_VER),3) # v3 here
OPTIONS_OBJS += $(51DEGREES_LIB)/../cityhash/city.o OPTIONS_OBJS += $(51DEGREES_LIB)/../cityhash/city.o
OPTIONS_OBJS += $(51DEGREES_LIB)/51Degrees.o OPTIONS_OBJS += $(51DEGREES_LIB)/51Degrees.o
ifeq ($(USE_THREAD),) ifeq ($(USE_THREAD:0=),)
51DEGREES_CFLAGS += -DFIFTYONEDEGREES_NO_THREADING 51DEGREES_CFLAGS += -DFIFTYONEDEGREES_NO_THREADING
else else
OPTIONS_OBJS += $(51DEGREES_LIB)/../threading.o OPTIONS_OBJS += $(51DEGREES_LIB)/../threading.o
@ -720,7 +720,7 @@ ifneq ($(USE_51DEGREES),)
USE_MATH = implicit USE_MATH = implicit
endif # USE_51DEGREES endif # USE_51DEGREES
ifneq ($(USE_WURFL),) ifneq ($(USE_WURFL:0=),)
# Use WURFL_SRC and possibly WURFL_INC and WURFL_LIB to force path # Use WURFL_SRC and possibly WURFL_INC and WURFL_LIB to force path
# to WURFL headers and libraries if needed. # to WURFL headers and libraries if needed.
WURFL_INC = $(WURFL_SRC) WURFL_INC = $(WURFL_SRC)
@ -736,12 +736,12 @@ ifneq ($(USE_WURFL),)
WURFL_LDFLAGS = $(if $(WURFL_LIB),-L$(WURFL_LIB)) -lwurfl WURFL_LDFLAGS = $(if $(WURFL_LIB),-L$(WURFL_LIB)) -lwurfl
endif endif
ifneq ($(USE_SYSTEMD),) ifneq ($(USE_SYSTEMD:0=),)
OPTIONS_OBJS += src/systemd.o OPTIONS_OBJS += src/systemd.o
endif endif
ifneq ($(USE_PCRE)$(USE_STATIC_PCRE)$(USE_PCRE_JIT),) ifneq ($(USE_PCRE:0=)$(USE_STATIC_PCRE:0=)$(USE_PCRE_JIT:0=),)
ifneq ($(USE_PCRE2)$(USE_STATIC_PCRE2)$(USE_PCRE2_JIT),) ifneq ($(USE_PCRE2:0=)$(USE_STATIC_PCRE2:0=)$(USE_PCRE2_JIT:0=),)
$(error cannot compile both PCRE and PCRE2 support) $(error cannot compile both PCRE and PCRE2 support)
endif endif
# PCREDIR is used to automatically construct the PCRE_INC and PCRE_LIB paths, # PCREDIR is used to automatically construct the PCRE_INC and PCRE_LIB paths,
@ -752,7 +752,7 @@ ifneq ($(USE_PCRE)$(USE_STATIC_PCRE)$(USE_PCRE_JIT),)
# locations. # locations.
# in case only USE_STATIC_PCRE/USE_PCRE_JIT were set # in case only USE_STATIC_PCRE/USE_PCRE_JIT were set
USE_PCRE := $(if $(USE_PCRE),$(USE_PCRE),implicit) USE_PCRE := $(if $(USE_PCRE:0=),$(USE_PCRE:0=),implicit)
PCRE_CONFIG := pcre-config PCRE_CONFIG := pcre-config
PCREDIR := $(shell $(PCRE_CONFIG) --prefix 2>/dev/null || echo /usr/local) PCREDIR := $(shell $(PCRE_CONFIG) --prefix 2>/dev/null || echo /usr/local)
ifneq ($(PCREDIR),) ifneq ($(PCREDIR),)
@ -761,16 +761,16 @@ ifneq ($(USE_PCRE)$(USE_STATIC_PCRE)$(USE_PCRE_JIT),)
endif endif
PCRE_CFLAGS := $(if $(PCRE_INC),-I$(PCRE_INC)) PCRE_CFLAGS := $(if $(PCRE_INC),-I$(PCRE_INC))
ifeq ($(USE_STATIC_PCRE),) ifeq ($(USE_STATIC_PCRE:0=),)
PCRE_LDFLAGS := $(if $(PCRE_LIB),-L$(PCRE_LIB)) -lpcreposix -lpcre PCRE_LDFLAGS := $(if $(PCRE_LIB),-L$(PCRE_LIB)) -lpcreposix -lpcre
else else
PCRE_LDFLAGS := $(if $(PCRE_LIB),-L$(PCRE_LIB)) -Wl,-Bstatic -lpcreposix -lpcre -Wl,-Bdynamic PCRE_LDFLAGS := $(if $(PCRE_LIB),-L$(PCRE_LIB)) -Wl,-Bstatic -lpcreposix -lpcre -Wl,-Bdynamic
endif endif
endif # USE_PCRE endif # USE_PCRE
ifneq ($(USE_PCRE2)$(USE_STATIC_PCRE2)$(USE_PCRE2_JIT),) ifneq ($(USE_PCRE2:0=)$(USE_STATIC_PCRE2:0=)$(USE_PCRE2_JIT:0=),)
# in case only USE_STATIC_PCRE2/USE_PCRE2_JIT were set # in case only USE_STATIC_PCRE2/USE_PCRE2_JIT were set
USE_PCRE2 := $(if $(USE_PCRE2),$(USE_PCRE2),implicit) USE_PCRE2 := $(if $(USE_PCRE2:0=),$(USE_PCRE2:0=),implicit)
PCRE2_CONFIG := pcre2-config PCRE2_CONFIG := pcre2-config
PCRE2DIR := $(shell $(PCRE2_CONFIG) --prefix 2>/dev/null || echo /usr/local) PCRE2DIR := $(shell $(PCRE2_CONFIG) --prefix 2>/dev/null || echo /usr/local)
ifneq ($(PCRE2DIR),) ifneq ($(PCRE2DIR),)
@ -800,7 +800,7 @@ ifneq ($(USE_PCRE2)$(USE_STATIC_PCRE2)$(USE_PCRE2_JIT),)
endif endif
endif endif
ifneq ($(USE_STATIC_PCRE2),) ifneq ($(USE_STATIC_PCRE2:0=),)
PCRE2_LDFLAGS := $(if $(PCRE2_LIB),-L$(PCRE2_LIB)) -Wl,-Bstatic -L$(PCRE2_LIB) $(PCRE2_LDFLAGS) -Wl,-Bdynamic PCRE2_LDFLAGS := $(if $(PCRE2_LIB),-L$(PCRE2_LIB)) -Wl,-Bstatic -L$(PCRE2_LIB) $(PCRE2_LDFLAGS) -Wl,-Bdynamic
else else
PCRE2_LDFLAGS := $(if $(PCRE2_LIB),-L$(PCRE2_LIB)) -L$(PCRE2_LIB) $(PCRE2_LDFLAGS) PCRE2_LDFLAGS := $(if $(PCRE2_LIB),-L$(PCRE2_LIB)) -L$(PCRE2_LIB) $(PCRE2_LDFLAGS)
@ -808,28 +808,28 @@ ifneq ($(USE_PCRE2)$(USE_STATIC_PCRE2)$(USE_PCRE2_JIT),)
endif # PCRE2DIR endif # PCRE2DIR
endif # USE_PCRE2 endif # USE_PCRE2
ifneq ($(USE_NS),) ifneq ($(USE_NS:0=),)
OPTIONS_OBJS += src/namespace.o OPTIONS_OBJS += src/namespace.o
endif endif
ifneq ($(USE_LINUX_CAP),) ifneq ($(USE_LINUX_CAP:0=),)
OPTIONS_OBJS += src/linuxcap.o OPTIONS_OBJS += src/linuxcap.o
endif endif
ifneq ($(USE_OT),) ifneq ($(USE_OT:0=),)
include addons/ot/Makefile include addons/ot/Makefile
endif endif
# better keep this one close to the end, as several libs above may need it # better keep this one close to the end, as several libs above may need it
ifneq ($(USE_DL),) ifneq ($(USE_DL:0=),)
DL_LDFLAGS = -ldl DL_LDFLAGS = -ldl
endif endif
ifneq ($(USE_MATH),) ifneq ($(USE_MATH:0=),)
MATH_LDFLAGS = -lm MATH_LDFLAGS = -lm
endif endif
ifneq ($(USE_LIBATOMIC),) ifneq ($(USE_LIBATOMIC:0=),)
LIBATOMIC_LDFLAGS = -latomic LIBATOMIC_LDFLAGS = -latomic
endif endif
@ -1157,7 +1157,7 @@ opts:
@#echo "$(strip $(BUILD_OPTIONS))" @#echo "$(strip $(BUILD_OPTIONS))"
@$(foreach opt,$(enabled_opts),\ @$(foreach opt,$(enabled_opts),\
$(if $(subst command line,,$(origin USE_$(opt))),,\ $(if $(subst command line,,$(origin USE_$(opt))),,\
echo -n 'USE_$(opt)=$(USE_$(opt)) ';) \ echo -n 'USE_$(opt)=$(USE_$(opt:0=)) ';) \
$(if $(subst command line,,$(origin $(opt)_CFLAGS)),\ $(if $(subst command line,,$(origin $(opt)_CFLAGS)),\
$(if $($(opt)_CFLAGS),echo -n '$(opt)_CFLAGS="$($(opt)_CFLAGS)" ';),\ $(if $($(opt)_CFLAGS),echo -n '$(opt)_CFLAGS="$($(opt)_CFLAGS)" ';),\
echo -n '$(opt)_CFLAGS="$($(opt)_CFLAGS)" ';) \ echo -n '$(opt)_CFLAGS="$($(opt)_CFLAGS)" ';) \

11
include/make/options.mk
View File

@ -23,14 +23,15 @@ build_options = $(foreach opt,$(use_opts),$(call ignore_implicit,$(opt)))
# Make a list of all known features with +/- prepended depending on their # Make a list of all known features with +/- prepended depending on their
# activation status. Must be a macro so that dynamically enabled ones are # activation status. Must be a macro so that dynamically enabled ones are
# evaluated with their current status. # evaluated with their current status.
build_features = $(foreach opt,$(patsubst USE_%,%,$(sort $(use_opts))),$(if $(USE_$(opt)),+$(opt),-$(opt))) build_features = $(foreach opt,$(patsubst USE_%,%,$(sort $(use_opts))),$(if $(USE_$(opt):0=),+$(opt),-$(opt)))
# This returns a list of -DUSE_* for all known USE_* that are set # This returns a list of -DUSE_* for all known USE_* that are set to anything
opts_as_defines = $(foreach opt,$(use_opts),$(if $($(opt)),-D$(opt),)) # neither empty nor '0'.
opts_as_defines = $(foreach opt,$(use_opts),$(if $($(opt):0=),-D$(opt),))
# Lists all enabled or disabled options without the "USE_" prefix # Lists all enabled or disabled options without the "USE_" prefix
enabled_opts = $(foreach opt,$(patsubst USE_%,%,$(use_opts)),$(if $(USE_$(opt)),$(opt),)) enabled_opts = $(foreach opt,$(patsubst USE_%,%,$(use_opts)),$(if $(USE_$(opt):0=),$(opt),))
disabled_opts = $(foreach opt,$(patsubst USE_%,%,$(use_opts)),$(if $(USE_$(opt)),,$(opt))) disabled_opts = $(foreach opt,$(patsubst USE_%,%,$(use_opts)),$(if $(USE_$(opt):0=),,$(opt)))
# preset all XXX_{INC,LIB,CFLAGS,LDFLAGS,SRC} variables to empty for $1=XXX # preset all XXX_{INC,LIB,CFLAGS,LDFLAGS,SRC} variables to empty for $1=XXX
reset_opt_vars = $(foreach name,INC LIB CFLAGS LDFLAGS SRC,$(eval $(1)_$(name)=)) reset_opt_vars = $(foreach name,INC LIB CFLAGS LDFLAGS SRC,$(eval $(1)_$(name)=))