From patchwork Fri May 27 15:35:42 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 576486 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:8607:0:0:0:0 with SMTP id bb7csp755927mab; Fri, 27 May 2022 08:52:39 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxh6FJngBf4oaLXQMUJHv0Pv612OkV/wKxjjSixXOyxIYCMIn3gZDz9EXQRUEsvd8x+V8xg X-Received: by 2002:a05:622a:551:b0:2f3:d590:9a5e with SMTP id m17-20020a05622a055100b002f3d5909a5emr33462113qtx.165.1653666759319; Fri, 27 May 2022 08:52:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1653666759; cv=none; d=google.com; s=arc-20160816; b=hxDpozTwLjc57kI7BpctfFdm78ZWfzefsNodBG0wC70DcZMmiCkrKHzBSo7ON6KW9h xNSHZ1rbUxUYMLVjb/93Ocqo8O1zQscht9RpsFscZpyL3yepPpgzh1pkTXGo3qPziRp9 HVnXhRgiSvpo2eYoalLR8dya+iN+0z950sZGp+dgKUQwUV5Ml+BD3PwPB+Hk++aM3TrY /MKrPZhMPkmYQ04LqMRaOckA0z9Eaw4VJEXi1coy3A1EIeAtooR7x0ggapfMi9WgfxHn 6uKxnOh4pv5lLRukwD/j1kwDA50nfSV008v4qeBbiNorJDo/QAboCwppah5B7gNsxvjr 2HBw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=u/FCtk4u6INm00qR2lG2PmRK9MrdLA/PPEmYrOoIpJs=; b=mR+WhqKilRYYmSRx3062kLCjtk+QRbxGE1T9jrMf+bZ0obrBElfcS/7dLDUmnSbM6S OjjRe0vxLWXn6ZPFpbpDDNV3SQkgWQCywiTgFPcy/UVnu/hYetK5tYMIwRsZayM+yzUV hdqnb8pzmd98vooiwEnnjdAwb4/7ikITnrudwazsnfBlvUy37JjRpIIRGvPrLLYtViHJ qQ/ArMhf3wb5S0vRguw0IJvzQBGinNxmQLXFZ+tOdANAgX30uTF56+CMC812SfnusckN UoKVO+DuUtAnF0vXuq3jDLHXinCbDJU07lHdkPSqRxPh+O+DXyAv58fY89anaUCZUejV apwQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=GwKMw3QP; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id l21-20020a05622a175500b002f3e004e8a2si2924749qtk.405.2022.05.27.08.52.39 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 27 May 2022 08:52:39 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=GwKMw3QP; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:44704 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nucGU-0008Ey-Up for patch@linaro.org; Fri, 27 May 2022 11:52:38 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37938) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nuc0l-0000en-Gr for qemu-devel@nongnu.org; Fri, 27 May 2022 11:36:23 -0400 Received: from mail-ej1-x630.google.com ([2a00:1450:4864:20::630]:41510) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nuc0j-0002S1-R1 for qemu-devel@nongnu.org; Fri, 27 May 2022 11:36:23 -0400 Received: by mail-ej1-x630.google.com with SMTP id ck4so9422029ejb.8 for ; Fri, 27 May 2022 08:36:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=u/FCtk4u6INm00qR2lG2PmRK9MrdLA/PPEmYrOoIpJs=; b=GwKMw3QPAwuQngByNe/U7og+zhrrMU1ZCsPnGy1BWOU00AFzlNI7yBASvsyERpBZak mDJpaU9fQ71A/Ob9OAby/aS2WBhPthYIJjouVoUfdn3cDYoKTz012n94VgOBNi7pBoQi KZrKk0EH74CepxNIbSy4scOen6FoRStiAM4Rs13WLs+tP42Q+kV15/TOe+nZYDQzBvzd /Os2y9yAhleQjJNJQy9t4OFBGsxSqzCxMS/X3gw5L9kGBGzWdcws5MC1u8WnnHvAuqDY qnpMCvMIcEXcTJzcsyvELLn+p4LnGGHkU1FwdG1rm+asO9a7IYMVZlhhX4jMTguH1yW+ tEpQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=u/FCtk4u6INm00qR2lG2PmRK9MrdLA/PPEmYrOoIpJs=; b=ugkDaCfrIODuczsQPe2/EpgleNJ1ZLFv4lEsok56J7tlfDRsJPl6PN52B5i5klicKJ bDdNq3UZbEmRJY7z0C+9oRA8JIVydEN3fIGscLRZ31/bK1yQWi5HR35DFJ3bRB7Q/2Bf r2ExL2ccaPTD4vT/QiYQNUgbU+LmgKvCsE6TeKyaktpCEJbEj0MDICPezOvLfl7RJDb0 Kov5jmtER5uWywzMFreTCxGXIPhlXxq1iFh/k1xAlHU6/wnKWEw6KIDeYRQD44lXzK8l jebUbG4n8JGx0KZdrdmXwZnofBrM9HhuRe3akArUbpDiNZsyRB9m9Ol4SIwNbbcLfHUy 2Tfw== X-Gm-Message-State: AOAM53356lWVjwwUAszSohaTG/hBKqqt3YABQ1233qagbvovLa9a88Pz kug+1W2TFdfItK18D6kDg2KM/g== X-Received: by 2002:a17:906:9d90:b0:6fe:b875:171e with SMTP id fq16-20020a1709069d9000b006feb875171emr30749051ejc.517.1653665780531; Fri, 27 May 2022 08:36:20 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id mp22-20020a1709071b1600b006fec4ee28d0sm1585046ejc.189.2022.05.27.08.36.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 May 2022 08:36:16 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 0117B1FFC4; Fri, 27 May 2022 16:36:05 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: fam@euphon.net, berrange@redhat.com, f4bug@amsat.org, aurelien@aurel32.net, pbonzini@redhat.com, stefanha@redhat.com, crosa@redhat.com, Richard Henderson , =?utf-8?q?Alex_Benn=C3=A9e?= Subject: [PATCH v1 12/33] configure: do not define or use the CPP variable Date: Fri, 27 May 2022 16:35:42 +0100 Message-Id: <20220527153603.887929-13-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220527153603.887929-1-alex.bennee@linaro.org> References: <20220527153603.887929-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::630; envelope-from=alex.bennee@linaro.org; helo=mail-ej1-x630.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Paolo Bonzini Just hardcode $(CC) -E, it should be enough. Signed-off-by: Paolo Bonzini Reviewed-by: Richard Henderson Message-Id: <20220517092616.1272238-2-pbonzini@redhat.com> Signed-off-by: Alex Bennée --- configure | 3 --- pc-bios/optionrom/Makefile | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/configure b/configure index 180ee688dc..7a071c161a 100755 --- a/configure +++ b/configure @@ -376,7 +376,6 @@ fi ar="${AR-${cross_prefix}ar}" as="${AS-${cross_prefix}as}" ccas="${CCAS-$cc}" -cpp="${CPP-$cc -E}" objcopy="${OBJCOPY-${cross_prefix}objcopy}" ld="${LD-${cross_prefix}ld}" ranlib="${RANLIB-${cross_prefix}ranlib}" @@ -2012,7 +2011,6 @@ echo "CC=$cc" >> $config_host_mak echo "AR=$ar" >> $config_host_mak echo "AS=$as" >> $config_host_mak echo "CCAS=$ccas" >> $config_host_mak -echo "CPP=$cpp" >> $config_host_mak echo "OBJCOPY=$objcopy" >> $config_host_mak echo "LD=$ld" >> $config_host_mak echo "QEMU_CFLAGS=$QEMU_CFLAGS" >> $config_host_mak @@ -2254,7 +2252,6 @@ preserve_env() { preserve_env AR preserve_env AS preserve_env CC -preserve_env CPP preserve_env CFLAGS preserve_env CXX preserve_env CXXFLAGS diff --git a/pc-bios/optionrom/Makefile b/pc-bios/optionrom/Makefile index 2494ad9c25..17ccc76241 100644 --- a/pc-bios/optionrom/Makefile +++ b/pc-bios/optionrom/Makefile @@ -50,7 +50,7 @@ override LDFLAGS = -m $(LD_I386_EMULATION) -T $(SRC_DIR)/flat.lds pvh.img: pvh.o pvh_main.o %.o: %.S - $(call quiet-command,$(CPP) $(CPPFLAGS) -c -o - $< | $(AS) $(ASFLAGS) -o $@,"AS","$@") + $(call quiet-command,$(CC) $(CPPFLAGS) -E -o - $< | $(AS) $(ASFLAGS) -o $@,"AS","$@") %.o: %.c $(call quiet-command,$(CC) $(CPPFLAGS) $(CFLAGS) -c $< -o $@,"CC","$@")