]> git.ipfire.org Git - thirdparty/gcc.git/commitdiff
Adjust CPP_FOR_BUILD
authorPekka Seppänen <pexu@gcc.mail.kapsi.fi>
Thu, 2 Dec 2021 20:58:49 +0000 (15:58 -0500)
committerJeff Law <jeffreyalaw@gmail.com>
Thu, 2 Dec 2021 20:59:37 +0000 (15:59 -0500)
Hi.

CPP/CPPFLAGS were changed by commit 84401ce5fb4ecab55decb472b168100e7593e01f.  That commit uses CPP as a default for CPP_FOR_BUILD.  Unless CPP is defined, GNU make defaults CPP as `$(CC) -E'.  Given the context, this is now incorrect, since CC_FOR_BUILD should be used.

Fixes PR103011.

-- Pekka

gcc/Changelog:

* configure: Regenerate.
* configure.ac: For CPP_FOR_BUILD use $(CC_FOR_BUILD) -E instead of
$(CPP).

configure
configure.ac

index f8e6e2c3020857d8f04e70e2fcbed6f44f881acf..7f619d24ec527553f9ddfa46149981acff393df9 100755 (executable)
--- a/configure
+++ b/configure
@@ -4094,7 +4094,7 @@ if test "${build}" != "${host}" ; then
   AR_FOR_BUILD=${AR_FOR_BUILD-ar}
   AS_FOR_BUILD=${AS_FOR_BUILD-as}
   CC_FOR_BUILD=${CC_FOR_BUILD-gcc}
-  CPP_FOR_BUILD="${CPP_FOR_BUILD-\$(CPP)}"
+  CPP_FOR_BUILD="${CPP_FOR_BUILD-\$(CC_FOR_BUILD) -E}"
   CXX_FOR_BUILD=${CXX_FOR_BUILD-g++}
   DSYMUTIL_FOR_BUILD=${DSYMUTIL_FOR_BUILD-dsymutil}
   GFORTRAN_FOR_BUILD=${GFORTRAN_FOR_BUILD-gfortran}
index 2de381fe86342d26a9830e6dfa3d1490d8adcfca..4ab9e34cc0880817ed8c5ffe9097f18b752de39d 100644 (file)
@@ -1334,7 +1334,7 @@ if test "${build}" != "${host}" ; then
   AR_FOR_BUILD=${AR_FOR_BUILD-ar}
   AS_FOR_BUILD=${AS_FOR_BUILD-as}
   CC_FOR_BUILD=${CC_FOR_BUILD-gcc}
-  CPP_FOR_BUILD="${CPP_FOR_BUILD-\$(CPP)}"
+  CPP_FOR_BUILD="${CPP_FOR_BUILD-\$(CC_FOR_BUILD) -E}"
   CXX_FOR_BUILD=${CXX_FOR_BUILD-g++}
   DSYMUTIL_FOR_BUILD=${DSYMUTIL_FOR_BUILD-dsymutil}
   GFORTRAN_FOR_BUILD=${GFORTRAN_FOR_BUILD-gfortran}