]> git.proxmox.com Git - mirror_frr.git/commitdiff
build: fix clippy cross-compile
authorDavid Lamparter <equinox@opensourcerouting.org>
Thu, 3 Aug 2017 11:31:28 +0000 (13:31 +0200)
committerDavid Lamparter <equinox@opensourcerouting.org>
Fri, 4 Aug 2017 09:09:45 +0000 (11:09 +0200)
Broke the build-for-host setup for clippy in the non-recursive changes
:/

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
lib/subdir.am

index 28a4ce5579c3f15683209188235983345c5b6c61..86fe09ca649a2edc326832178e1b889b35d1716c 100644 (file)
@@ -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 = \