From 604219f2fc9393701679a636891c63981c73c854 Mon Sep 17 00:00:00 2001
From: John Safranek <john@wolfssl.com>
Date: Thu, 14 Nov 2019 14:15:21 -0800
Subject: [PATCH] Sync OCTEON fix 1. For OCTEON builds, leave out the
 "-DCVMX_BUILD_FOR_LINUX_HOST" option from CFLAGS by default so it makes
 standalone host builds. 2. Add a check of the variable OCTEON_HOST for linux
 to add back in the "-DCVMX_BUILD_FOR_LINUX_HOST" to CFLAGS.

---
 configure.ac | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index dc5ed6e69..9abd4c495 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3903,6 +3903,7 @@ AC_ARG_WITH([cavium-v],
 # Cavium Octeon
 OCTEON_ROOT=""
 : ${OCTEON_OBJ="obj-octeon2"}
+: ${OCTEON_HOST="standalone"}
 
 AC_ARG_WITH([octeon-sync],
     [AS_HELP_STRING([--with-octeon-sync=PATH],[PATH to Cavium Octeon SDK dir (sync)])],
@@ -3917,8 +3918,9 @@ AC_ARG_WITH([octeon-sync],
         fi
 
         AM_CFLAGS="$AM_CFLAGS -DHAVE_CAVIUM_OCTEON_SYNC"
-        AM_CFLAGS="$AM_CFLAGS -DOCTEON_MODEL=$OCTEON_MODEL -DCVMX_BUILD_FOR_LINUX_HOST"
+        AM_CFLAGS="$AM_CFLAGS -DOCTEON_MODEL=$OCTEON_MODEL"
         AM_CFLAGS="$AM_CFLAGS -I$OCTEON_ROOT/executive"
+        AS_CASE([$OCTEON_HOST],['linux'],[AM_CFLAGS="$AM_CFLAGS -DCVMX_BUILD_FOR_LINUX_HOST"])
 
         #-I$OCTEON_ROOT/target/include 
         AM_LDFLAGS="$AM_LDFLAGS -lrt -Xlinker -T -Xlinker $OCTEON_ROOT/executive/cvmx-shared-linux.ld"