This is the mail archive of the libc-alpha@sourceware.org mailing list for the glibc project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

Re: [PATCH] Make copy of <bits/std_abs.h> from GCC 7 [BZ #21573]


On Jun 13 2017, "H.J. Lu" <hjl.tools@gmail.com> wrote:

> diff --git a/configure b/configure
> index 422482f..888224e 100755
> --- a/configure
> +++ b/configure
> @@ -5336,10 +5336,13 @@ fi
>  # copy of those headers in Makerules.
>  if test -n "$CXX"; then
>    find_cxx_header () {
> -    echo "#include <$1>" | $CXX -M -MP -x c++ - | sed -n "/$1:/{s/:\$//;p}"
> +    echo "#include <$1>" | $CXX -M -MP -x c++ - | sed -n "/$2:/{s/:\$//;p}"
>    }
> -  CXX_CSTDLIB_HEADER="$(find_cxx_header cstdlib)"
> -  CXX_CMATH_HEADER="$(find_cxx_header cmath)"
> +  CXX_CSTDLIB_HEADER="$(find_cxx_header cstdlib cstdlib)"
> +  # Also make a copy of <bits/std_abs.h> from GCC 7 to prevent it from
> +  # including /usr/include/stdlib.h.
> +  CXX_CSTDLIB_HEADER="$CXX_CSTDLIB_HEADER $(find_cxx_header bits/std_abs.h bits\\\/std_abs.h)"

Use a different delimiter in the sed command.

Andreas.

-- 
Andreas Schwab, SUSE Labs, schwab@suse.de
GPG Key fingerprint = 0196 BAD8 1CE9 1970 F4BE  1748 E4D4 88E3 0EEA B9D7
"And now for something completely different."


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]