Skip to content

Commit 69a6939

Browse files
rbgargatohojo
authored andcommitted
libxdp: fix build with clang 18
Use compiler to link. While here, retire LD from configure since this is not used anymore Signed-off-by: Renato Botelho do Couto <[email protected]>
1 parent afb3d58 commit 69a6939

File tree

2 files changed

+2
-4
lines changed

2 files changed

+2
-4
lines changed

configure

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,6 @@ check_toolchain()
5959

6060
: ${PKG_CONFIG:=pkg-config}
6161
: ${CC=gcc}
62-
: ${LD=ld}
6362
: ${OBJCOPY=objcopy}
6463
: ${CLANG=clang}
6564
: ${LLC=llc}
@@ -73,7 +72,7 @@ check_toolchain()
7372
CLANG=$(find_tool clang "$CLANG")
7473
LLC=$(find_tool llc "$LLC")
7574

76-
for TOOL in $PKG_CONFIG $CC $LD $OBJCOPY $CLANG $LLC $M4 $READELF; do
75+
for TOOL in $PKG_CONFIG $CC $OBJCOPY $CLANG $LLC $M4 $READELF; do
7776
if [ ! $(command -v ${TOOL} 2>/dev/null) ]; then
7877
echo "*** ERROR: Cannot find tool ${TOOL}" ;
7978
exit 1;
@@ -130,7 +129,6 @@ check_toolchain()
130129

131130
echo "PKG_CONFIG:=${PKG_CONFIG}" >>$CONFIG
132131
echo "CC:=${CC}" >>$CONFIG
133-
echo "LD:=${LD}" >>$CONFIG
134132
echo "OBJCOPY:=${OBJCOPY}" >>$CONFIG
135133
echo "CLANG:=${CLANG}" >>$CONFIG
136134
echo "LLC:=${LLC}" >>$CONFIG

lib/libxdp/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ $(TEMPLATED_SOURCES): %.c: %.c.in Makefile
131131
$(QUIET_M4)$(M4) $(DEFINES) $< > $@ || ( ret=$$?; rm -f $@; exit $$ret )
132132

133133
$(EMBEDDED_XDP_OBJS): %.embed.o: %.o
134-
$(QUIET_GEN)$(LD) -r -b binary -o $@ -z noexecstack --format=binary $<
134+
$(QUIET_CC)$(CC) -r -nostdlib -Wl,-z,noexecstack,--format=binary -o $@ $<
135135
$(Q)$(OBJCOPY) --rename-section .data=.rodata,alloc,load,readonly,data,contents $@
136136

137137
$(XDP_OBJS): %.o: %.c $(BPF_HEADERS) $(LIBMK)

0 commit comments

Comments
 (0)