From 31b03876fc58a7b7fd27968aecc5aea6312dfeeb Mon Sep 17 00:00:00 2001
From: DonBearH <32063987+DonBearH@users.noreply.github.com>
Date: Thu, 8 Nov 2018 14:57:44 +0800
Subject: [PATCH] Setting FF_DPDK with MACHINE_CPUARCH

---
 lib/Makefile | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/Makefile b/lib/Makefile
index 89e713021..03409983b 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -23,8 +23,10 @@ FF_KNI=1
 #FF_NETGRAPH=1
 #FF_IPFW=1
 
+include ${TOPDIR}/mk/kern.pre.mk
+
 ifeq ($(FF_DPDK),)
-ifeq (${shell uname -m},aarch64)
+ifeq (${MACHINE_CPUARCH},aarch64)
     FF_DPDK=${TOPDIR}/dpdk/build
 else
     FF_DPDK=${TOPDIR}/dpdk/x86_64-native-linuxapp-gcc
@@ -32,7 +34,7 @@ endif
 endif
 
 ifdef RTE_SDK
-ifeq (${shell uname -m},aarch64) 
+ifeq (${MACHINE_CPUARCH},aarch64) 
     FF_DPDK=${RTE_SDK}/build
 else
     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
 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
 DPDK_CFLAGS+= -I${FF_DPDK}/include
 
-include ${TOPDIR}/mk/kern.pre.mk
-
 KERNPREINCLUDES:= ${INCLUDES}
 INCLUDES= -I${OVERRIDE_INCLUDES_ROOT} ${KERNPREINCLUDES}
 INCLUDES+= -I./machine_include