summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Lamparter <equinox@opensourcerouting.org>2017-08-03 13:31:28 +0200
committerDavid Lamparter <equinox@opensourcerouting.org>2017-08-04 11:09:45 +0200
commit89727c8d9e8474bdb16986ce9631b8fa6e10544f (patch)
treee7e881b5548b52aec18fdefafc68f323a88a99ca
parentMerge pull request #891 from Jafaral/portability (diff)
downloadfrr-89727c8d9e8474bdb16986ce9631b8fa6e10544f.tar.xz
frr-89727c8d9e8474bdb16986ce9631b8fa6e10544f.zip
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>
-rw-r--r--lib/subdir.am10
1 files changed, 8 insertions, 2 deletions
diff --git a/lib/subdir.am b/lib/subdir.am
index 28a4ce557..86fe09ca6 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 = \