[gcc r12-5761] Adjust CPP_FOR_BUILD

Jeff Law law@gcc.gnu.org
Thu Dec 2 20:59:59 GMT 2021


https://gcc.gnu.org/g:c841dc0a4dd944cf8f76f414a286aedff1e38dce

commit r12-5761-gc841dc0a4dd944cf8f76f414a286aedff1e38dce
Author: Pekka Seppänen <pexu@gcc.mail.kapsi.fi>
Date:   Thu Dec 2 15:58:49 2021 -0500

    Adjust CPP_FOR_BUILD
    
    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).

Diff:
---
 configure    | 2 +-
 configure.ac | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/configure b/configure
index f8e6e2c3020..7f619d24ec5 100755
--- 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}
diff --git a/configure.ac b/configure.ac
index 2de381fe863..4ab9e34cc08 100644
--- a/configure.ac
+++ b/configure.ac
@@ -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}


More information about the Gcc-cvs mailing list