X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;ds=sidebyside;f=.ci%2Flinux-build.sh;h=e1f52553274d477760dcab15cc16aeb55e2639c9;hb=a9729f7e1484b96467ea59a9ffcaa13390c2c04a;hp=91e43a975b8193489a3b46e1f1be5dcb7ca10256;hpb=7da138af1cc0f1dca8ef3be1061477d4ff2c74c2;p=dpdk.git

diff --git a/.ci/linux-build.sh b/.ci/linux-build.sh
index 91e43a975b..e1f5255327 100755
--- a/.ci/linux-build.sh
+++ b/.ci/linux-build.sh
@@ -54,11 +54,13 @@ catch_coredump() {
 }
 
 if [ "$AARCH64" = "true" ]; then
-    # convert the arch specifier
-    if [ "$CC_FOR_BUILD" = "gcc" ]; then
-    	OPTS="$OPTS --cross-file config/arm/arm64_armv8_linux_gcc"
-    elif [ "$CC_FOR_BUILD" = "clang" ]; then
-    	OPTS="$OPTS --cross-file config/arm/arm64_armv8_linux_clang_ubuntu1804"
+    # Note: common/cnxk is disabled for Ubuntu 18.04
+    # https://bugs.dpdk.org/show_bug.cgi?id=697
+    OPTS="$OPTS -Ddisable_drivers=common/cnxk"
+    if [ "${CC%%clang}" != "$CC" ]; then
+        OPTS="$OPTS --cross-file config/arm/arm64_armv8_linux_clang_ubuntu1804"
+    else
+        OPTS="$OPTS --cross-file config/arm/arm64_armv8_linux_gcc"
     fi
 fi
 
@@ -77,7 +79,7 @@ else
     OPTS="$OPTS -Dexamples=all"
 fi
 
-OPTS="$OPTS -Dmachine=default"
+OPTS="$OPTS -Dplatform=generic"
 OPTS="$OPTS --default-library=$DEF_LIB"
 OPTS="$OPTS --buildtype=debugoptimized"
 OPTS="$OPTS -Dcheck_includes=true"