Skip to content

Commit 31b0387

Browse files
authored
Setting FF_DPDK with MACHINE_CPUARCH
1 parent e404bd1 commit 31b0387

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

lib/Makefile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,16 +23,18 @@ FF_KNI=1
2323
#FF_NETGRAPH=1
2424
#FF_IPFW=1
2525

26+
include ${TOPDIR}/mk/kern.pre.mk
27+
2628
ifeq ($(FF_DPDK),)
27-
ifeq (${shell uname -m},aarch64)
29+
ifeq (${MACHINE_CPUARCH},aarch64)
2830
FF_DPDK=${TOPDIR}/dpdk/build
2931
else
3032
FF_DPDK=${TOPDIR}/dpdk/x86_64-native-linuxapp-gcc
3133
endif
3234
endif
3335

3436
ifdef RTE_SDK
35-
ifeq (${shell uname -m},aarch64)
37+
ifeq (${MACHINE_CPUARCH},aarch64)
3638
FF_DPDK=${RTE_SDK}/build
3739
else
3840
FF_DPDK=${RTE_SDK}/x86_64-native-linuxapp-gcc
@@ -45,8 +47,6 @@ DPDK_CFLAGS+= -DRTE_MACHINE_CPUFLAG_SSSE3 -DRTE_MACHINE_CPUFLAG_SSE4_1 -DRTE_MAC
4547
DPDK_CFLAGS+= -DRTE_COMPILE_TIME_CPUFLAGS=RTE_CPUFLAG_SSE,RTE_CPUFLAG_SSE2,RTE_CPUFLAG_SSE3,RTE_CPUFLAG_SSSE3,RTE_CPUFLAG_SSE4_1,RTE_CPUFLAG_SSE4_2
4648
DPDK_CFLAGS+= -I${FF_DPDK}/include
4749

48-
include ${TOPDIR}/mk/kern.pre.mk
49-
5050
KERNPREINCLUDES:= ${INCLUDES}
5151
INCLUDES= -I${OVERRIDE_INCLUDES_ROOT} ${KERNPREINCLUDES}
5252
INCLUDES+= -I./machine_include

0 commit comments

Comments
 (0)