diff mbox series

Adjust CPP_FOR_BUILD

Message ID 19a3d068fe8cb886cd2ea9012dd14b37@gcc.mail.kapsi.fi
State New
Headers
Series Adjust CPP_FOR_BUILD |

Commit Message

Pekka Seppänen Nov. 11, 2021, 9:10 a.m. UTC 
  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    | 2 +-
  configure.ac | 2 +-
  2 files changed, 2 insertions(+), 2 deletions(-)

Comments

Jeff Law Dec. 2, 2021, 9:01 p.m. UTC | #1 
On 11/11/2021 2:10 AM, Pekka Seppänen wrote:
> 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).
Thanks.  Installed.

jeff
diff mbox series

Patch

diff --git a/configure b/configure
index 58979d6e3b1..a5eca91fb2a 100755
--- a/configure
+++ b/configure
@@ -4092,7 +4092,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 550e6993b59..b8055dad573 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}