* configure.ac: Add libelf to host_libs. Enable in-tree configury
of ppl and cloog. Fix in-tree configury of libelf, skip tests. Fix portability of test of C++ as bootstrap language. Add ppl/src/ppl-config.o to the bootstrap compare exclusion list. * configure: Rebuild. * Makefile.def: Drop host and target settings from gmp, mpfr, ppl, and cloog. Fix in-tree ppl configuration. Introduce libelf in-tree building. * Makefile.tpl (POSTSTAGE1_CXX_EXPORT): New. (POSTSTAGE1_HOST_EXPORTS): Use it. (STAGE[+id+]_CXXFLAGS): New. (BASE_FLAGS_TO_PASS): Pass it down. (configure-stage[+id+]-[+prefix+][+module+]): Use it. Add extra_exports. (all-stage[+id+]-[+prefix+][+module+]): Likewise. (configure-[+prefix+][+module+], all-[+prefix+][+module+]): Add extra_exports. * Makefile.in: Rebuild. * configure.ac (FLAGS_FOR_TARGET): Add -L and -isystem paths for *-w64-mingw* and x86_64-*mingw*. * configure: Regenerated. * configure.ac: Disable target-winsup & co for x86_64-*-mingw* and *-w64-mingw* targets. * configure: Regenerated. * configure.ac (CLooG test): Use = with test. * configure: Regenerate. * configure.ac: Do not set LIBS for ppl/cloog checks. Disable cloog if the ppl version check failed. Move flags saving before setting in libelf check. * configure: Regenerate. * configure.ac: Adjust the ppl and cloog configure to work as documented. Disable cloog if ppl was disabled. Omit the version checks if they were disabled. * configure: Re-generate.
This commit is contained in:
Alexandre Oliva
79
configure
vendored
79
configure
vendored
@ -2893,7 +2893,7 @@ build_tools="build-texinfo build-byacc build-flex build-bison build-m4 build-fix
|
||||
|
||||
# these libraries are used by various programs built for the host environment
|
||||
#
|
||||
host_libs="intl mmalloc libiberty opcodes bfd readline tcl tk itcl libgui zlib libcpp libdecnumber gmp mpfr mpc ppl cloog libiconv"
|
||||
host_libs="intl mmalloc libiberty opcodes bfd readline tcl tk itcl libgui zlib libcpp libdecnumber gmp mpfr mpc ppl cloog libelf libiconv"
|
||||
|
||||
# these tools are built for the host environment
|
||||
# Note, the powerpc-eabi build depends on sim occurring before gdb in order to
|
||||
@ -3509,12 +3509,14 @@ case "${target}" in
|
||||
# if the --with-newlib option has been given, because otherwise
|
||||
# 'target-newlib' will appear in skipdirs.
|
||||
;;
|
||||
i[3456789]86-*-mingw32*)
|
||||
i[3456789]86-w64-mingw*)
|
||||
noconfigdirs="$noconfigdirs expect target-libgloss target-newlib ${libgcj}"
|
||||
;;
|
||||
i[3456789]86-*-mingw*)
|
||||
target_configdirs="$target_configdirs target-winsup"
|
||||
noconfigdirs="$noconfigdirs expect target-libgloss target-newlib ${libgcj}"
|
||||
;;
|
||||
x86_64-*-mingw*)
|
||||
target_configdirs="$target_configdirs target-winsup"
|
||||
noconfigdirs="$noconfigdirs expect target-libgloss target-newlib ${libgcj}"
|
||||
;;
|
||||
*-*-cygwin*)
|
||||
@ -3855,7 +3857,7 @@ case "${host}" in
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking to see if cat works as expected" >&5
|
||||
$as_echo_n "checking to see if cat works as expected... " >&6; }
|
||||
echo a >cygwin-cat-check
|
||||
if test `cat cygwin-cat-check` == a ; then
|
||||
if test `cat cygwin-cat-check` = a ; then
|
||||
rm cygwin-cat-check
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
|
||||
$as_echo "yes" >&6; }
|
||||
@ -5749,8 +5751,6 @@ pplinc=
|
||||
# Check whether --with-ppl was given.
|
||||
if test "${with_ppl+set}" = set; then :
|
||||
withval=$with_ppl;
|
||||
else
|
||||
with_ppl=no
|
||||
fi
|
||||
|
||||
|
||||
@ -5770,10 +5770,11 @@ case $with_ppl in
|
||||
no)
|
||||
ppllibs=
|
||||
;;
|
||||
"" | yes)
|
||||
;;
|
||||
*)
|
||||
ppllibs="-L$with_ppl/lib -lppl_c -lppl -lgmpxx"
|
||||
pplinc="-I$with_ppl/include $pplinc"
|
||||
LIBS="$ppllibs $LIBS"
|
||||
;;
|
||||
esac
|
||||
if test "x$with_ppl_include" != x; then
|
||||
@ -5781,12 +5782,11 @@ if test "x$with_ppl_include" != x; then
|
||||
fi
|
||||
if test "x$with_ppl_lib" != x; then
|
||||
ppllibs="-L$with_ppl_lib -lppl_c -lppl -lgmpxx"
|
||||
LIBS="$ppllibs $LIBS"
|
||||
fi
|
||||
if test "x$with_ppl$with_ppl_include$with_ppl_lib" = x && test -d ${srcdir}/ppl; then
|
||||
ppllibs='-L$$r/$(HOST_SUBDIR)/ppl/.libs -L$$r/$(HOST_SUBDIR)/ppl/_libs -lppl_c -lppl -lgmpxx '
|
||||
pplinc='-I$$r/$(HOST_SUBDIR)/ppl/include -I$$s/ppl/include '
|
||||
LIBS="$ppllibs $LIBS"
|
||||
ppllibs='-L$$r/$(HOST_SUBDIR)/ppl/interfaces/C/.libs -L$$r/$(HOST_SUBDIR)/ppl/interfaces/C/_libs -L$$r/$(HOST_SUBDIR)/ppl/src/.libs -L$$r/$(HOST_SUBDIR)/ppl/src/_libs -lppl_c -lppl -lgmpxx '
|
||||
pplinc='-I$$r/$(HOST_SUBDIR)/ppl/src -I$$r/$(HOST_SUBDIR)/ppl/interfaces/C '
|
||||
enable_ppl_version_check=no
|
||||
fi
|
||||
|
||||
# Check whether --enable-ppl-version-check was given.
|
||||
@ -5797,7 +5797,7 @@ else
|
||||
fi
|
||||
|
||||
|
||||
if test "${ENABLE_PPL_CHECK}" = "yes"; then
|
||||
if test "x$with_ppl" != "xno" -a "${ENABLE_PPL_CHECK}" = "yes"; then
|
||||
saved_CFLAGS="$CFLAGS"
|
||||
CFLAGS="$CFLAGS $pplinc $gmpinc"
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for version $ppl_major_version.$ppl_minor_version of PPL" >&5
|
||||
@ -5822,7 +5822,7 @@ if ac_fn_c_try_compile "$LINENO"; then :
|
||||
$as_echo "yes" >&6; }
|
||||
else
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
||||
$as_echo "no" >&6; }; ppllibs= ; pplinc=
|
||||
$as_echo "no" >&6; }; ppllibs= ; pplinc= ; with_ppl=no
|
||||
fi
|
||||
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
||||
CFLAGS="$saved_CFLAGS"
|
||||
@ -5841,8 +5841,6 @@ clooginc=" -DCLOOG_PPL_BACKEND "
|
||||
# Check whether --with-cloog was given.
|
||||
if test "${with_cloog+set}" = set; then :
|
||||
withval=$with_cloog;
|
||||
else
|
||||
with_cloog=no
|
||||
fi
|
||||
|
||||
|
||||
@ -5858,15 +5856,20 @@ if test "${with_cloog_lib+set}" = set; then :
|
||||
fi
|
||||
|
||||
|
||||
if test "x$with_ppl" = "xno"; then
|
||||
with_cloog=no
|
||||
fi
|
||||
|
||||
case $with_cloog in
|
||||
no)
|
||||
clooglibs=
|
||||
clooginc=
|
||||
;;
|
||||
"" | yes)
|
||||
;;
|
||||
*)
|
||||
clooglibs="-L$with_cloog/lib -lcloog"
|
||||
clooginc="-I$with_cloog/include -DCLOOG_PPL_BACKEND "
|
||||
LIBS="$clooglibs $LIBS"
|
||||
;;
|
||||
esac
|
||||
if test "x$with_cloog_include" != x; then
|
||||
@ -5874,12 +5877,11 @@ if test "x$with_cloog_include" != x; then
|
||||
fi
|
||||
if test "x$with_cloog_lib" != x; then
|
||||
clooglibs="-L$with_cloog_lib -lcloog"
|
||||
LIBS="$clooglibs $LIBS"
|
||||
fi
|
||||
if test "x$with_cloog$with_cloog_include$with_cloog_lib" = x && test -d ${srcdir}/cloog; then
|
||||
clooglibs='-L$$r/$(HOST_SUBDIR)/cloog/.libs -L$$r/$(HOST_SUBDIR)/cloog/_libs -lcloog '
|
||||
clooginc='-I$$r/$(HOST_SUBDIR)/cloog/include -I$$s/cloog/include -DCLOOG_PPL_BACKEND '
|
||||
LIBS="$clooglibs $LIBS"
|
||||
enable_cloog_version_check=no
|
||||
fi
|
||||
|
||||
# Check whether --enable-cloog-version-check was given.
|
||||
@ -5890,7 +5892,7 @@ else
|
||||
fi
|
||||
|
||||
|
||||
if test "${ENABLE_CLOOG_CHECK}" = "yes"; then
|
||||
if test "x$with_cloog" != "xno" -a "${ENABLE_CLOOG_CHECK}" = "yes"; then
|
||||
saved_CFLAGS="$CFLAGS"
|
||||
CFLAGS="$CFLAGS $clooginc $gmpinc $pplinc"
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for correct version of CLooG" >&5
|
||||
@ -5957,6 +5959,10 @@ if test "${with_libelf_lib+set}" = set; then :
|
||||
fi
|
||||
|
||||
|
||||
saved_CFLAGS="$CFLAGS"
|
||||
saved_CPPFLAGS="$CPPFLAGS"
|
||||
saved_LIBS="$LIBS"
|
||||
|
||||
case $with_libelf in
|
||||
"")
|
||||
libelflibs="-lelf"
|
||||
@ -5980,14 +5986,11 @@ fi
|
||||
|
||||
if test "x$with_libelf$with_libelf_include$with_libelf_lib" = x \
|
||||
&& test -d ${srcdir}/libelf; then
|
||||
libelflibs='-L$$r/$(HOST_SUBDIR)/libelf/.libs -L$$r/$(HOST_SUBDIR)/libelf/_libs -lelf '
|
||||
libelfinc='-I$$r/$(HOST_SUBDIR)/libelf/include -I$$s/libelf/include'
|
||||
libelflibs='-L$$r/$(HOST_SUBDIR)/libelf/lib -lelf '
|
||||
libelfinc='-D__LIBELF_INTERNAL__ -I$$r/$(HOST_SUBDIR)/libelf/lib -I$$s/libelf/lib'
|
||||
LIBS="$libelflibs $LIBS"
|
||||
fi
|
||||
|
||||
saved_CFLAGS="$CFLAGS"
|
||||
saved_CPPFLAGS="$CPPFLAGS"
|
||||
saved_LIBS="$LIBS"
|
||||
else
|
||||
|
||||
CFLAGS="$CFLAGS $libelfinc"
|
||||
CPPFLAGS="$CPPFLAGS $libelfinc"
|
||||
@ -6516,6 +6519,8 @@ to specify its location." "$LINENO" 5
|
||||
CPPFLAGS="$saved_CPPFLAGS"
|
||||
LIBS="$saved_LIBS"
|
||||
|
||||
fi
|
||||
|
||||
# Flags needed for libelf.
|
||||
|
||||
|
||||
@ -6628,7 +6633,8 @@ if test -d ${srcdir}/gcc; then
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if test "$language" = "c++" -a "$ENABLE_BUILD_WITH_CXX" = "yes"; then
|
||||
if test "$language" = "c++" \
|
||||
&& test "$ENABLE_BUILD_WITH_CXX" = "yes"; then
|
||||
boot_language=yes
|
||||
fi
|
||||
|
||||
@ -7799,8 +7805,9 @@ case " $target_configdirs " in
|
||||
case " $target_configargs " in
|
||||
*" --with-newlib "*)
|
||||
case "$target" in
|
||||
*-cygwin*)
|
||||
FLAGS_FOR_TARGET=$FLAGS_FOR_TARGET' -L$$r/$(TARGET_SUBDIR)/winsup -L$$r/$(TARGET_SUBDIR)/winsup/cygwin -L$$r/$(TARGET_SUBDIR)/winsup/w32api/lib -isystem $$s/winsup/include -isystem $$s/winsup/cygwin/include -isystem $$s/winsup/w32api/include' ;;
|
||||
*-cygwin*)
|
||||
FLAGS_FOR_TARGET=$FLAGS_FOR_TARGET' -L$$r/$(TARGET_SUBDIR)/winsup -L$$r/$(TARGET_SUBDIR)/winsup/cygwin -L$$r/$(TARGET_SUBDIR)/winsup/w32api/lib -isystem $$s/winsup/include -isystem $$s/winsup/cygwin/include -isystem $$s/winsup/w32api/include'
|
||||
;;
|
||||
esac
|
||||
|
||||
# If we're not building GCC, don't discard standard headers.
|
||||
@ -7856,10 +7863,17 @@ case " $target_configdirs " in
|
||||
esac
|
||||
;;
|
||||
esac
|
||||
|
||||
case "$target" in
|
||||
*-mingw*)
|
||||
# Can't be handled as Cygwin above since Mingw does not use newlib.
|
||||
FLAGS_FOR_TARGET=$FLAGS_FOR_TARGET' -L$$r/$(TARGET_SUBDIR)/winsup/mingw -L$$r/$(TARGET_SUBDIR)/winsup/w32api/lib -isystem $$s/winsup/mingw/include -isystem $$s/winsup/w32api/include' ;;
|
||||
x86_64-*mingw* | *-w64-mingw*)
|
||||
# MinGW-w64 does not use newlib, nor does it use winsup. It may,
|
||||
# however, use a symlink named 'mingw' in ${prefix} .
|
||||
FLAGS_FOR_TARGET=$FLAGS_FOR_TARGET' -L${prefix}/${target}/lib -L${prefix}/mingw/lib -isystem ${prefix}/${target}/include -isystem ${prefix}/mingw/include'
|
||||
;;
|
||||
*-mingw*)
|
||||
# MinGW can't be handled as Cygwin above since it does not use newlib.
|
||||
FLAGS_FOR_TARGET=$FLAGS_FOR_TARGET' -L$$r/$(TARGET_SUBDIR)/winsup/mingw -L$$r/$(TARGET_SUBDIR)/winsup/w32api/lib -isystem $$s/winsup/mingw/include -isystem $$s/winsup/w32api/include'
|
||||
;;
|
||||
esac
|
||||
|
||||
# Allow the user to override the flags for
|
||||
@ -14261,6 +14275,9 @@ case "$target" in
|
||||
hppa*64*-*-hpux*) ;;
|
||||
hppa*-*-hpux*) compare_exclusions="gcc/cc*-checksum\$(objext) | */libgcc/lib2funcs* | gcc/ada/*tools/*" ;;
|
||||
esac
|
||||
case " $configdirs " in
|
||||
*" ppl "*) compare_exclusions="$compare_exclusions | ppl/src/ppl-config.o" ;;
|
||||
esac
|
||||
|
||||
|
||||
ac_config_files="$ac_config_files Makefile"
|
||||
|
||||
Reference in New Issue
Block a user