From nobody Fri May 17 07:56:00 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1619954082; cv=none; d=zohomail.com; s=zohoarc; b=A1VQQE619lmqnLSwqTDjxgwFL2bpWh1qkPyQVyzWhfvblh1/6BH9PZd79bAgOsWuQ+xUF4Vftm1PKLOcDZBYnhdEQVeB+CWHiDANAEdDUQ26XCZQYE7Hgf3+nDnTUURAvQ9gbVcpk1IpR9hdzb1J2h2G9+l5Q+HsU/qpGZeVrls= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619954082; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=V8EHLQ/Z0ifZKD7En6nRrA+DALAWOMmFTGgdJF0tdAo=; b=QRMtq6N3ednUi6S4s2+IibdDhYpZyeCdSdWJT9kY+y6ZhXlTKyqgUkplxHrZ8fsHHGQt0peqX/XwAwMtbSrUzIvJZPxMY/Fd5CBBUhqMnnb09M3351R4iEIB6j70Hl4MHBjdtmo1g5vna5oUEE0A7frQp3bkyNH9iyghETmh0N0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1619954082361720.5122256299151; Sun, 2 May 2021 04:14:42 -0700 (PDT) Received: from localhost ([::1]:54046 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ldA3c-0007VV-Lc for importer@patchew.org; Sun, 02 May 2021 07:14:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54056) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ldA1o-0006en-2I for qemu-devel@nongnu.org; Sun, 02 May 2021 07:12:48 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:45233) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ldA1k-0000XS-HZ for qemu-devel@nongnu.org; Sun, 02 May 2021 07:12:47 -0400 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-89-lt6lVyRfMdOnQ4SudAFsag-1; Sun, 02 May 2021 07:12:38 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id B9DB61898297; Sun, 2 May 2021 11:12:37 +0000 (UTC) Received: from thuth.com (ovpn-112-16.ams2.redhat.com [10.36.112.16]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6C3BD687CC; Sun, 2 May 2021 11:12:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1619953961; 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=V8EHLQ/Z0ifZKD7En6nRrA+DALAWOMmFTGgdJF0tdAo=; b=aGsTdbzi47bD5RqLuQ+I/gQ7aGP/IcuZwnS8t+9s4u8zabIK2cdu2KOGvIxHw6rZ0mGeNs XJgKL4GaNFhZgZxXAOucfmDKgHCCDUGHetwd2wZU6XmnllA+Hzsqamucm0RY1vDyv7Impy WMilv1rH7sVbZcUgG0HUM9RMgcKKEjU= X-MC-Unique: lt6lVyRfMdOnQ4SudAFsag-1 From: Thomas Huth To: qemu-s390x@nongnu.org, Christian Borntraeger Subject: [PATCH] pc-bios/s390-ccw: Fix the cc-option macro in the Makefile Date: Sun, 2 May 2021 13:12:33 +0200 Message-Id: <20210502111233.784836-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=thuth@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=216.205.24.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -34 X-Spam_score: -3.5 X-Spam_bar: --- X-Spam_report: (-3.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.697, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Cornelia Huck , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" The cc-option macro is not doing what it should - compared with the original from the rules.mak file that got removed with commit 660f793093 ("Makefile: inline the relevant parts of rules.mak"), the arguments got changed and thus the macro is rather doubling the QEMU_CFLAGS than adding the flag that should be tested. Fixes: 22fb2ab096 ("pc-bios/s390-ccw: do not use rules.mak") Signed-off-by: Thomas Huth --- pc-bios/s390-ccw/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pc-bios/s390-ccw/Makefile b/pc-bios/s390-ccw/Makefile index abf088d500..782025629e 100644 --- a/pc-bios/s390-ccw/Makefile +++ b/pc-bios/s390-ccw/Makefile @@ -6,8 +6,8 @@ include ../../config-host.mak CFLAGS =3D -O2 -g =20 quiet-command =3D $(if $(V),$1,$(if $(2),@printf " %-7s %s\n" $2 $3 && $1= , @$1)) -cc-option =3D $(if $(shell $(CC) $1 -S -o /dev/null -xc /dev/null > /dev/n= ull \ - 2>&1 && echo OK), $1, $2) +cc-option =3D $(if $(shell $(CC) $1 $2 -S -o /dev/null -xc /dev/null \ + >/dev/null 2>&1 && echo OK), $2, $3) =20 VPATH_SUFFIXES =3D %.c %.h %.S %.m %.mak %.sh %.rc Kconfig% %.json.in set-vpath =3D $(if $1,$(foreach PATTERN,$(VPATH_SUFFIXES),$(eval vpath $(P= ATTERN) $1))) --=20 2.27.0