BUILD: makefile: ensure that all USE_* handlers appear before CFLAGS are used
It happens that a few "if USE_foo" were placed too low in the makefile, and would mostly work by luck thanks to not using variables that were already referenced before. The opentracing include is even trickier because it extends OPTIONS_CFLAGS that was last read a few lines before being included, but it only works because COPTS is defined as a macro and not a variable, so it will be evaluated later. At least now it doesn't touch OPTIONS_* anymore and since it's cleanly arranged, it will work by default via the flags collector. Let's just move these late USE_* handlers upper and place a visible delimiter after them reminding not to add any after.
This commit is contained in:
parent
ea3e67f891
commit
bc2f3934f9
27
Makefile
27
Makefile
|
@ -803,6 +803,21 @@ endif
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
ifneq ($(USE_NS),)
|
||||||
|
OPTIONS_OBJS += src/namespace.o
|
||||||
|
endif
|
||||||
|
|
||||||
|
ifneq ($(USE_OT),)
|
||||||
|
include addons/ot/Makefile
|
||||||
|
endif
|
||||||
|
|
||||||
|
ifneq ($(USE_LIBATOMIC),)
|
||||||
|
TARGET_LDFLAGS += -latomic
|
||||||
|
endif
|
||||||
|
|
||||||
|
#### End of the USE_* options handling, any such option that would be added
|
||||||
|
#### below could be silently ignored.
|
||||||
|
|
||||||
# appends all foo_{C,LD}FLAGS to OPTIONS_{C,LD}FLAGS
|
# appends all foo_{C,LD}FLAGS to OPTIONS_{C,LD}FLAGS
|
||||||
$(collect_opts_flags)
|
$(collect_opts_flags)
|
||||||
|
|
||||||
|
@ -827,18 +842,6 @@ TRACE_COPTS := $(filter-out -O0 -O1 -O2 -pg -finstrument-functions,$(COPTS)) -O3
|
||||||
COPTS += -finstrument-functions
|
COPTS += -finstrument-functions
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifneq ($(USE_NS),)
|
|
||||||
OPTIONS_OBJS += src/namespace.o
|
|
||||||
endif
|
|
||||||
|
|
||||||
ifneq ($(USE_OT),)
|
|
||||||
include addons/ot/Makefile
|
|
||||||
endif
|
|
||||||
|
|
||||||
ifneq ($(USE_LIBATOMIC),)
|
|
||||||
TARGET_LDFLAGS += -latomic
|
|
||||||
endif
|
|
||||||
|
|
||||||
#### Global link options
|
#### Global link options
|
||||||
# These options are added at the end of the "ld" command line. Use LDFLAGS to
|
# These options are added at the end of the "ld" command line. Use LDFLAGS to
|
||||||
# add options at the beginning of the "ld" command line if needed.
|
# add options at the beginning of the "ld" command line if needed.
|
||||||
|
|
|
@ -70,6 +70,4 @@ OPTIONS_OBJS += \
|
||||||
addons/ot/src/vars.o
|
addons/ot/src/vars.o
|
||||||
endif
|
endif
|
||||||
|
|
||||||
OPTIONS_CFLAGS += $(OT_CFLAGS) -Iaddons/ot/include
|
OT_CFLAGS := $(OT_CFLAGS) -Iaddons/ot/include $(OT_DEFINE)
|
||||||
OPTIONS_LDFLAGS += $(OT_LDFLAGS)
|
|
||||||
OPTIONS_CFLAGS += $(OT_DEFINE)
|
|
||||||
|
|
Loading…
Reference in New Issue