From bf05b3b78b3ef21f93cd0e6a261d5db39ba8f065 Mon Sep 17 00:00:00 2001 From: DonBearH <32063987+DonBearH@users.noreply.github.com> Date: Thu, 8 Nov 2018 10:03:22 +0800 Subject: [PATCH] Update Makefile for reserving FF_DPDK for x86 The former patch, which add compiler option for arm64, removes the FF_DPDK for x86. That's a mistake. --- lib/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/Makefile b/lib/Makefile index 4c7c3c756..89e713021 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -24,18 +24,18 @@ FF_KNI=1 #FF_IPFW=1 ifeq ($(FF_DPDK),) -ifeq (${MACHINE_CPUARCH},aarch64) +ifeq (${shell uname -m},aarch64) FF_DPDK=${TOPDIR}/dpdk/build else - #FF_DPDK=${TOPDIR}/dpdk/x86_64-native-linuxapp-gcc + FF_DPDK=${TOPDIR}/dpdk/x86_64-native-linuxapp-gcc endif endif ifdef RTE_SDK -ifeq (${MACHINE_CPUARCH},aarch64) +ifeq (${shell uname -m},aarch64) FF_DPDK=${RTE_SDK}/build else - #FF_DPDK=${RTE_SDK}/x86_64-native-linuxapp-gcc + FF_DPDK=${RTE_SDK}/x86_64-native-linuxapp-gcc endif endif