mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager
synced 2024-07-21 18:24:49 +00:00
build: move nm.mk into main Makefile.am
This commit is contained in:
parent
2296db22c8
commit
03e88d92a6
13
Makefile.am
13
Makefile.am
|
@ -1,6 +1,5 @@
|
||||||
include $(GLIB_MAKEFILE)
|
include $(GLIB_MAKEFILE)
|
||||||
-include $(INTROSPECTION_MAKEFILE)
|
-include $(INTROSPECTION_MAKEFILE)
|
||||||
include nm.mk
|
|
||||||
|
|
||||||
@GNOME_CODE_COVERAGE_RULES@
|
@GNOME_CODE_COVERAGE_RULES@
|
||||||
|
|
||||||
|
@ -83,6 +82,18 @@ SUBDIRS = \
|
||||||
|
|
||||||
###############################################################################
|
###############################################################################
|
||||||
|
|
||||||
|
set_sanitizer_env = \
|
||||||
|
[ -n "$(SANITIZER_ENV)" ] && export $(SANITIZER_ENV) ; \
|
||||||
|
if [ -n "$(1)" ] && echo $(CFLAGS) | grep -e -fsanitize=address ; then \
|
||||||
|
export LD_PRELOAD="$${LD_PRELOAD}:$$(ldd $(1) | grep libasan\.so\.. -o | head -n 1)"; \
|
||||||
|
fi
|
||||||
|
|
||||||
|
check_so_symbols = \
|
||||||
|
$(call set_sanitizer_env,$(1)); \
|
||||||
|
LD_BIND_NOW=1 LD_PRELOAD=$${LD_PRELOAD}:$(1) $(top_builddir)/src/NetworkManager --version >/dev/null
|
||||||
|
|
||||||
|
###############################################################################
|
||||||
|
|
||||||
DISTCHECK_CONFIGURE_FLAGS = \
|
DISTCHECK_CONFIGURE_FLAGS = \
|
||||||
--enable-tests=yes \
|
--enable-tests=yes \
|
||||||
--with-valgrind=no \
|
--with-valgrind=no \
|
||||||
|
|
11
nm.mk
11
nm.mk
|
@ -1,11 +0,0 @@
|
||||||
# NetworkManager Makefile helpers
|
|
||||||
|
|
||||||
set_sanitizer_env = \
|
|
||||||
[ -n "$(SANITIZER_ENV)" ] && export $(SANITIZER_ENV) ; \
|
|
||||||
if [ -n "$(1)" ] && echo $(CFLAGS) | grep -e -fsanitize=address ; then \
|
|
||||||
export LD_PRELOAD="$${LD_PRELOAD}:$$(ldd $(1) | grep libasan\.so\.. -o | head -n 1)"; \
|
|
||||||
fi
|
|
||||||
|
|
||||||
check_so_symbols = \
|
|
||||||
$(call set_sanitizer_env,$(1)); \
|
|
||||||
LD_BIND_NOW=1 LD_PRELOAD=$${LD_PRELOAD}:$(1) $(top_builddir)/src/NetworkManager --version >/dev/null
|
|
Loading…
Reference in a new issue