From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 961ECA0032; Fri, 29 Oct 2021 11:26:13 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 78C88410E1; Fri, 29 Oct 2021 11:26:13 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mails.dpdk.org (Postfix) with ESMTP id AB9BD410E0 for ; Fri, 29 Oct 2021 11:26:12 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1635499572; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AWYE2YTIYYAY63Hc9Z0DBI5wLAUw1Q8lFiRowJkT8Uo=; b=cAGLtixEtVnaK6hB7OOfYu9U5vo8g1kYqipxFev3PMltEOpvwDYCpYLlgbGXZMv8Q8Qw9S mMu1n0GVQxOWvQ85A92nO+kAkCylvzkv8VMQeGqbPjZVFNR773Sw5sCJvxXjNjig0NLJfD UbPW6BhlSYLHmgMQ1RYOvCyVagc/gEU= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-247-c1CRPdiFPtGGplt-ng0PjQ-1; Fri, 29 Oct 2021 05:26:09 -0400 X-MC-Unique: c1CRPdiFPtGGplt-ng0PjQ-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id CE138362F8; Fri, 29 Oct 2021 09:26:07 +0000 (UTC) Received: from dmarchan.remote.csb (unknown [10.40.192.79]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0FCF3641AB; Fri, 29 Oct 2021 09:26:05 +0000 (UTC) From: David Marchand To: dev@dpdk.org Cc: Aaron Conole , Michael Santana , =?UTF-8?q?Juraj=20Linke=C5=A1?= Date: Fri, 29 Oct 2021 11:25:56 +0200 Message-Id: <20211029092556.11598-1-david.marchand@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=david.marchand@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Subject: [dpdk-dev] [PATCH] ci: fix aarch64 cross compilation in GHA X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Afaics, CC_FOR_BUILD is a Travis env variable. This results in GHA aarch64 cross compilation jobs building x86 binaries. Example in a recent job on main branch: 2021-10-28T09:51:06.4976495Z + .ci/linux-build.sh 2021-10-28T09:51:06.4985674Z + [ -n build ] 2021-10-28T09:51:06.4987636Z + [ true = true ] 2021-10-28T09:51:06.4987991Z + [ = gcc ] 2021-10-28T09:51:06.4989419Z + [ = clang ] 2021-10-28T09:51:06.4990907Z + [ false = true ] 2021-10-28T09:51:06.4991348Z + [ false = true ] 2021-10-28T09:51:06.4992846Z + [ static = static ] 2021-10-28T09:51:06.4993550Z + OPTS= -Dexamples=l2fwd,l3fwd 2021-10-28T09:51:06.4995388Z + OPTS= -Dexamples=l2fwd,l3fwd -Dplatform=generic 2021-10-28T09:51:06.4996279Z + OPTS= -Dexamples=l2fwd,l3fwd -Dplatform=generic --default-library=static 2021-10-28T09:51:06.4998553Z + OPTS= -Dexamples=l2fwd,l3fwd -Dplatform=generic --default-library=static --buildtype=debugoptimized 2021-10-28T09:51:06.4999949Z + OPTS= -Dexamples=l2fwd,l3fwd -Dplatform=generic --default-library=static --buildtype=debugoptimized -Dcheck_includes=true 2021-10-28T09:51:06.5002643Z + meson build --werror -Dexamples=l2fwd,l3fwd -Dplatform=generic --default-library=static --buildtype=debugoptimized -Dcheck_includes=true Fixes: 5d0b4ffa6964 ("ci: add aarch64 clang cross-compilation Travis builds") Signed-off-by: David Marchand --- This patch can't be merged right away, since build issues are now raised in GHA. Please ARM people, have a look. Thanks. --- .ci/linux-build.sh | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/.ci/linux-build.sh b/.ci/linux-build.sh index 06aaa79100..3bd681e8c5 100755 --- a/.ci/linux-build.sh +++ b/.ci/linux-build.sh @@ -54,11 +54,10 @@ 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" + 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 -- 2.23.0