Skip to content

Commit c2eb81e

Browse files
committed
Fix xdp-tools submodule to work with libbpf submodule
Update the version of xdp-tools to pull in some configure changes that makes interoperating between a libbpf submodule and an xdp-tools submodule work better, and set the LIBBPF_UNBUILT variable in the top-level configure to enables this support. Signed-off-by: Toke Høiland-Jørgensen <[email protected]>
1 parent 6b10ae1 commit c2eb81e

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

configure

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,9 @@ check_libxdp()
192192
echo "SYSTEM_LIBXDP:=n" >> $CONFIG
193193
if [ "$SUBMODULE_LIBBPF" -eq "1" ]; then
194194
echo "Configuring libxdp to use our libbpf submodule"
195-
(export LIBBPF_DIR="$(readlink -m lib/libbpf)" LIBBPF_INCLUDE_DIR="$(readlink -m lib/install/include)";
195+
(export LIBBPF_DIR="$(readlink -m lib/libbpf)" \
196+
LIBBPF_INCLUDE_DIR="$(readlink -m lib/install/include)" \
197+
LIBBPF_UNBUILT=1;
196198
cd lib/xdp-tools; ./configure)
197199
else
198200
echo "Configuring libxdp without our libbpf"

lib/xdp-tools

0 commit comments

Comments
 (0)