[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v1 12/33] configure: do not define or use the CPP variable
From: |
Alex Bennée |
Subject: |
[PATCH v1 12/33] configure: do not define or use the CPP variable |
Date: |
Fri, 27 May 2022 16:35:42 +0100 |
From: Paolo Bonzini <pbonzini@redhat.com>
Just hardcode $(CC) -E, it should be enough.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20220517092616.1272238-2-pbonzini@redhat.com>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
---
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","$@")
--
2.30.2
- [PATCH v1 05/33] tests/lcitool: fix up indentation to correct style, (continued)
- [PATCH v1 05/33] tests/lcitool: fix up indentation to correct style, Alex Bennée, 2022/05/27
- [PATCH v1 04/33] meson.build: fix summary display of test compilers, Alex Bennée, 2022/05/27
- [PATCH v1 08/33] tests/docker: update debian-mipsel-cross with lcitool, Alex Bennée, 2022/05/27
- [PATCH v1 09/33] tests/docker: update debian-mips64el-cross with lcitool, Alex Bennée, 2022/05/27
- [PATCH v1 06/33] tests/docker: update debian-armhf-cross with lcitool, Alex Bennée, 2022/05/27
- [PATCH v1 12/33] configure: do not define or use the CPP variable,
Alex Bennée <=
- [PATCH v1 10/33] tests/docker: update debian-ppc64el-cross with lcitool, Alex Bennée, 2022/05/27
- [PATCH v1 14/33] build: add a more generic way to specify make->ninja dependencies, Alex Bennée, 2022/05/27
- [PATCH v1 07/33] tests/docker: update debian-armel-cross with lcitool, Alex Bennée, 2022/05/27
- [PATCH v1 26/33] configure: enable cross compilation of vof, Alex Bennée, 2022/05/27
- [PATCH v1 18/33] tests/tcg: merge configure.sh back into main configure script, Alex Bennée, 2022/05/27
- [PATCH v1 17/33] tests/tcg: correct target CPU for sparc32, Alex Bennée, 2022/05/27
- [PATCH v1 29/33] gitlab: convert Cirrus jobs to .base_job_template, Alex Bennée, 2022/05/27