diff options
Diffstat (limited to 'tools/net')
| -rw-r--r-- | tools/net/ynl/Makefile.deps | 20 |
1 files changed, 6 insertions, 14 deletions
diff --git a/tools/net/ynl/Makefile.deps b/tools/net/ynl/Makefile.deps index 524fc4bb586b..f842bc66b967 100644 --- a/tools/net/ynl/Makefile.deps +++ b/tools/net/ynl/Makefile.deps @@ -9,20 +9,12 @@ UAPI_PATH:=../../../../include/uapi/ -# If the header does not exist at all in the system path - let the -# compiler fall back to the kernel header via -Idirafter. -# GCC seems to ignore header guard if the header is different, so we need -# to specify the -D$(hdr_guard). -# And we need to define HASH indirectly because GNU Make 4.2 wants it escaped -# and Gnu Make 4.4 wants it without escaping. +# scripts/headers_install.sh strips "_UAPI" from header guards so we +# need the explicit -D matching what's in /usr, to avoid multiple definitions. -HASH := \# +get_hdr_inc=-D$(1) -include $(UAPI_PATH)/linux/$(2) -get_hdr_inc=$(if $(shell echo "$(HASH)include <linux/$(2)>" | \ - cpp >>/dev/null 2>/dev/null && echo yes),\ - -D$(1) -include $(UAPI_PATH)/linux/$(2)) - -CFLAGS_devlink:=$(call get_hdr_inc,_UAPI_LINUX_DEVLINK_H_,devlink.h) +CFLAGS_devlink:=$(call get_hdr_inc,_LINUX_DEVLINK_H_,devlink.h) CFLAGS_ethtool:=$(call get_hdr_inc,_LINUX_ETHTOOL_NETLINK_H_,ethtool_netlink.h) -CFLAGS_handshake:=$(call get_hdr_inc,_UAPI_LINUX_HANDSHAKE_H,handshake.h) -CFLAGS_netdev:=$(call get_hdr_inc,_UAPI_LINUX_NETDEV_H,netdev.h) +CFLAGS_handshake:=$(call get_hdr_inc,_LINUX_HANDSHAKE_H,handshake.h) +CFLAGS_netdev:=$(call get_hdr_inc,_LINUX_NETDEV_H,netdev.h) |