From 89727c8d9e8474bdb16986ce9631b8fa6e10544f Mon Sep 17 00:00:00 2001
From: David Lamparter <equinox@opensourcerouting.org>
Date: Thu, 3 Aug 2017 13:31:28 +0200
Subject: [PATCH] build: fix clippy cross-compile

Broke the build-for-host setup for clippy in the non-recursive changes
:/

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
---
 lib/subdir.am | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/lib/subdir.am b/lib/subdir.am
index 28a4ce5579..86fe09ca64 100644
--- a/lib/subdir.am
+++ b/lib/subdir.am
@@ -180,16 +180,22 @@ lib_libfrrsnmp_la_SOURCES = \
 # CLI utilities
 #
 noinst_PROGRAMS += \
-	lib/clippy \
 	lib/grammar_sandbox \
 	# end
 
+if BUILD_CLIPPY
+noinst_PROGRAMS += lib/clippy
+else
+$(HOSTTOOLS)lib/clippy:
+	@$(MAKE) -C $(top_builddir)/$(HOSTTOOLS) lib/route_types.h lib/clippy
+endif
+
 lib_grammar_sandbox_SOURCES = \
 	lib/grammar_sandbox_main.c
 lib_grammar_sandbox_LDADD = \
 	lib/libfrr.la
 
-lib_clippy_CPPFLAGS = -D_GNU_SOURCE -I$(top_srcdir)/lib
+lib_clippy_CPPFLAGS = $(AM_CPPFLAGS) -D_GNU_SOURCE
 lib_clippy_CFLAGS = $(PYTHON_CFLAGS)
 lib_clippy_LDADD = $(PYTHON_LIBS)
 lib_clippy_SOURCES = \
-- 
2.39.5