summaryrefslogtreecommitdiffstats
path: root/contrib/libstdc++/configure
diff options
context:
space:
mode:
Diffstat (limited to 'contrib/libstdc++/configure')
-rwxr-xr-xcontrib/libstdc++/configure14
1 files changed, 8 insertions, 6 deletions
diff --git a/contrib/libstdc++/configure b/contrib/libstdc++/configure
index a533377..fd8b11e 100755
--- a/contrib/libstdc++/configure
+++ b/contrib/libstdc++/configure
@@ -1468,7 +1468,7 @@ else
if { (eval echo configure:1469: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
for file in conftest.*; do
case $file in
- *.c | *.o | *.obj) ;;
+ *.$ac_ext | *.c | *.o | *.obj) ;;
*) ac_cv_exeext=`echo $file | sed -e s/conftest//` ;;
esac
done
@@ -2451,7 +2451,7 @@ x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*)
x86_64-*linux*)
LD="${LD-ld} -m elf_i386"
;;
- ppc64-*linux*)
+ ppc64-*linux*|powerpc64-*linux*)
LD="${LD-ld} -m elf32ppclinux"
;;
s390x-*linux*)
@@ -23798,7 +23798,9 @@ done
# Determine if checking the ABI is desirable.
- if test x$enable_symvers = xno; then
+ # Only build this as native, since automake does not understand
+ # CXX_FOR_BUILD.
+ if test x"$GLIBCPP_IS_CROSS_COMPILING" = xtrue || test x$enable_symvers = xno; then
enable_abi_check=no
else
case "$host" in
@@ -23902,7 +23904,7 @@ glibcpp_prefixdir=${prefix}
# Process the option --with-gxx-include-dir=<path to include-files directory>
echo $ac_n "checking for --with-gxx-include-dir""... $ac_c" 1>&6
-echo "configure:23906: checking for --with-gxx-include-dir" >&5
+echo "configure:23908: checking for --with-gxx-include-dir" >&5
# Check whether --with-gxx-include-dir or --without-gxx-include-dir was given.
if test "${with_gxx_include_dir+set}" = set; then
withval="$with_gxx_include_dir"
@@ -23926,7 +23928,7 @@ echo "$ac_t""$gxx_include_dir" 1>&6
# Process the option "--enable-version-specific-runtime-libs"
echo $ac_n "checking for --enable-version-specific-runtime-libs""... $ac_c" 1>&6
-echo "configure:23930: checking for --enable-version-specific-runtime-libs" >&5
+echo "configure:23932: checking for --enable-version-specific-runtime-libs" >&5
# Check whether --enable-version-specific-runtime-libs or --disable-version-specific-runtime-libs was given.
if test "${enable_version_specific_runtime_libs+set}" = set; then
enableval="$enable_version_specific_runtime_libs"
@@ -23973,7 +23975,7 @@ if test x"$glibcpp_toolexecdir" = x"no"; then
fi
echo $ac_n "checking for install location""... $ac_c" 1>&6
-echo "configure:23977: checking for install location" >&5
+echo "configure:23979: checking for install location" >&5
echo "$ac_t""$gxx_include_dir" 1>&6
OpenPOWER on IntegriCloud