about summary refs log tree commit diff
path: root/sysdeps/nptl/configure
diff options
context:
space:
mode:
authorRoland McGrath <roland@hack.frob.com>2014-07-03 21:46:59 -0700
committerRoland McGrath <roland@hack.frob.com>2014-07-03 21:46:59 -0700
commit78b984ae2c015997be860b0eedc880691d6620cf (patch)
treeb82690bbedc889f9634499d56464dde0ce2b1b68 /sysdeps/nptl/configure
parent2d5976a58069dda271d81fdcec36de13345d77ac (diff)
downloadglibc-78b984ae2c015997be860b0eedc880691d6620cf.tar.gz
glibc-78b984ae2c015997be860b0eedc880691d6620cf.tar.xz
glibc-78b984ae2c015997be860b0eedc880691d6620cf.zip
Fix unwind.h configure check for bare environment.
Diffstat (limited to 'sysdeps/nptl/configure')
-rw-r--r--sysdeps/nptl/configure8
1 files changed, 7 insertions, 1 deletions
diff --git a/sysdeps/nptl/configure b/sysdeps/nptl/configure
index 65ed16400c..cce07b35d2 100644
--- a/sysdeps/nptl/configure
+++ b/sysdeps/nptl/configure
@@ -15,7 +15,12 @@ $as_echo_n "checking for forced unwind support... " >&6; }
 if ${libc_cv_forced_unwind+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  old_CPPFLAGS="$CPPFLAGS"
+# Without inhibit_libc #define'd, GCC's unwind.h (at least for ia64)
+# will try to include <stdlib.h>, which doesn't exist yet if we're
+# building libc in a bare environment.
+CPPFLAGS="$CPPFLAGS -Dinhibit_libc=1"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <unwind.h>
 int
@@ -35,6 +40,7 @@ else
   libc_cv_forced_unwind=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+CPPFLAGS="$old_CPPFLAGS"
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $libc_cv_forced_unwind" >&5
 $as_echo "$libc_cv_forced_unwind" >&6; }