diff options
Diffstat (limited to 'libc/configure.in')
| -rw-r--r-- | libc/configure.in | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/libc/configure.in b/libc/configure.in index 895868dc3..bf2cb5412 100644 --- a/libc/configure.in +++ b/libc/configure.in @@ -954,6 +954,9 @@ AC_CHECK_PROG_VER(SED, sed, --version, [GNU sed[^0-9]* \([0-9]*\.[0-9.]*\)], [3.0[2-9]*|3.[1-9]*|[4-9]*], SED=: aux_missing="$aux_missing sed") +AC_CHECK_PROG_VER(AWK, gawk, --version, + [GNU Awk[^0-9]*\([0-9][0-9.]*\)], + [[3-9].*], critic_missing="$critic_missing gawk") AC_CHECK_TOOL(READELF, readelf, false) AC_CHECK_TOOL(NM, nm, false) @@ -1000,13 +1003,11 @@ if test -n "$sysheaders"; then CXX_SYSINCLUDES= cxxversion=`$CXX -dumpversion 2>&AS_MESSAGE_LOG_FD` && cxxmachine=`$CXX -dumpmachine 2>&AS_MESSAGE_LOG_FD` && - for d in include "$cxxmachine/include"; do - i=../../../../$d/c++/$cxxversion - cxxheaders=`$CXX -print-file-name="$i"` && - test "x$cxxheaders" != x && test "x$i" != "x$cxxheaders" && - CXX_SYSINCLUDES="$CXX_SYSINCLUDES -isystem $cxxheaders \ + cxxplus=`$CXX -print-prog-name=cc1plus` + cxxheaders=`$cxxplus -v /dev/null 2>&1 | sed -n '/ \//{p;q;}' | sed 's/ //'` + test "x$cxxheaders" != x && test "x$i" != "x$cxxheaders" && + CXX_SYSINCLUDES="$CXX_SYSINCLUDES -isystem $cxxheaders \ -isystem $cxxheaders/$cxxmachine -isystem $cxxheaders/backward" - done fi fi AC_SUBST(SYSINCLUDES) @@ -1071,7 +1072,6 @@ else fi AC_SUBST(libc_cv_have_ksh) -AC_PROG_AWK dnl We need gawk for at least gen-sorted.awk and option-groups.awk. if test "x$AWK" != "xgawk"; then AC_MSG_ERROR([GLIBC requires GNU awk.]) @@ -2180,7 +2180,6 @@ AC_SUBST(libc_cv_rootsbindir) AC_SUBST(libc_cv_forced_unwind) dnl sysdeps/CPU/configure.in checks set this via arch-specific asm tests -AC_SUBST(libc_cv_cpp_asm_debuginfo) AC_SUBST(libc_cv_cc_sse4) AC_SUBST(libc_cv_cc_avx) AC_SUBST(libc_cv_cc_sse2avx) |