mirror of
git://gcc.gnu.org/git/gcc.git
synced 2025-03-31 23:41:01 +08:00
re PR bootstrap/54138 (configuring --without-cloog but executable links against system cloog)
2012-09-03 Richard Guenther <rguenther@suse.de> PR bootstrap/54138 * configure.ac: Re-organize ISL / CLOOG checks to allow disabling with either --without-isl or --without-cloog. * configure: Regenerated. * config/cloog.m4: Adjust. * config/isl.m4: Adjust. From-SVN: r190895
This commit is contained in:
Richard Guenther
Richard Biener
parent
bda2b77217
commit
625afa230c
@ -1,3 +1,10 @@
|
||||
2012-09-03 Richard Guenther <rguenther@suse.de>
|
||||
|
||||
PR bootstrap/54138
|
||||
* configure.ac: Re-organize ISL / CLOOG checks to allow
|
||||
disabling with either --without-isl or --without-cloog.
|
||||
* configure: Regenerated.
|
||||
|
||||
2012-09-03 Georg-Johann Lay <avr@gjlay.de>
|
||||
|
||||
* configure.ac (noconfigdirs,target=avr): Add target-libquadmath.
|
||||
|
||||
@ -1,3 +1,9 @@
|
||||
2012-09-03 Richard Guenther <rguenther@suse.de>
|
||||
|
||||
PR bootstrap/54138
|
||||
* config/cloog.m4: Adjust for toplevel reorg.
|
||||
* config/isl.m4: Adjust.
|
||||
|
||||
2012-08-26 Art Haas <ahaas@impactweather.com>
|
||||
|
||||
* cloog.m4 (CLOOG_INIT_FLAGS): Use = instead of == in test.
|
||||
|
||||
@ -22,12 +22,6 @@
|
||||
# Initialize clooglibs/clooginc according to the user input.
|
||||
AC_DEFUN([CLOOG_INIT_FLAGS],
|
||||
[
|
||||
AC_ARG_WITH(cloog,
|
||||
[AS_HELP_STRING(
|
||||
[--with-cloog=PATH],
|
||||
[Specify prefix directory for the installed CLooG-PPL package.
|
||||
Equivalent to --with-cloog-include=PATH/include
|
||||
plus --with-cloog-lib=PATH/lib])])
|
||||
AC_ARG_WITH([cloog-include],
|
||||
[AS_HELP_STRING(
|
||||
[--with-cloog-include=PATH],
|
||||
@ -72,11 +66,7 @@ AC_DEFUN([CLOOG_INIT_FLAGS],
|
||||
fi
|
||||
|
||||
clooginc="-DCLOOG_INT_GMP ${clooginc}"
|
||||
clooglibs="${clooglibs} -lcloog-isl ${isllibs}"
|
||||
|
||||
dnl Flags needed for CLOOG
|
||||
AC_SUBST(clooglibs)
|
||||
AC_SUBST(clooginc)
|
||||
clooglibs="${clooglibs} -lcloog-isl ${isllibs} -lisl"
|
||||
]
|
||||
)
|
||||
|
||||
|
||||
@ -23,12 +23,6 @@
|
||||
# Initialize isllibs/islinc according to the user input.
|
||||
AC_DEFUN([ISL_INIT_FLAGS],
|
||||
[
|
||||
AC_ARG_WITH(isl,
|
||||
[AS_HELP_STRING(
|
||||
[--with-isl=PATH],
|
||||
[Specify prefix directory for the installed ISL package.
|
||||
Equivalent to --with-isl-include=PATH/include
|
||||
plus --with-isl-lib=PATH/lib])])
|
||||
AC_ARG_WITH([isl-include],
|
||||
[AS_HELP_STRING(
|
||||
[--with-isl-include=PATH],
|
||||
@ -73,12 +67,6 @@ AC_DEFUN([ISL_INIT_FLAGS],
|
||||
islinc='-I$$r/$(HOST_SUBDIR)/isl/include -I$$s/isl/include'
|
||||
ENABLE_ISL_CHECK=no
|
||||
fi
|
||||
|
||||
isllibs="${isllibs} -lisl"
|
||||
|
||||
dnl Flags needed for ISL
|
||||
AC_SUBST(isllibs)
|
||||
AC_SUBST(islinc)
|
||||
]
|
||||
)
|
||||
|
||||
|
||||
70
configure
vendored
70
configure
vendored
@ -646,7 +646,6 @@ extra_host_libiberty_configure_flags
|
||||
clooginc
|
||||
clooglibs
|
||||
islinc
|
||||
isllibs
|
||||
poststage1_ldflags
|
||||
poststage1_libs
|
||||
stage1_libs
|
||||
@ -768,11 +767,11 @@ with_stage1_ldflags
|
||||
with_stage1_libs
|
||||
with_boot_libs
|
||||
with_boot_ldflags
|
||||
with_cloog
|
||||
with_isl
|
||||
with_isl_include
|
||||
with_isl_lib
|
||||
enable_isl_version_check
|
||||
with_cloog
|
||||
with_cloog_include
|
||||
with_cloog_lib
|
||||
enable_cloog_version_check
|
||||
@ -1521,16 +1520,16 @@ Optional Packages:
|
||||
--with-boot-libs=LIBS libraries for stage2 and later
|
||||
--with-boot-ldflags=FLAGS
|
||||
linker flags for stage2 and later
|
||||
--with-cloog=PATH Specify prefix directory for the installed CLooG-ISL
|
||||
package. Equivalent to
|
||||
--with-cloog-include=PATH/include plus
|
||||
--with-cloog-lib=PATH/lib
|
||||
--with-isl=PATH Specify prefix directory for the installed ISL
|
||||
package. Equivalent to
|
||||
--with-isl-include=PATH/include plus
|
||||
--with-isl-lib=PATH/lib
|
||||
--with-isl-include=PATH Specify directory for installed ISL include files
|
||||
--with-isl-lib=PATH Specify the directory for the installed ISL library
|
||||
--with-cloog=PATH Specify prefix directory for the installed CLooG-PPL
|
||||
package. Equivalent to
|
||||
--with-cloog-include=PATH/include plus
|
||||
--with-cloog-lib=PATH/lib
|
||||
--with-cloog-include=PATH
|
||||
Specify directory for installed CLooG include files
|
||||
--with-cloog-lib=PATH Specify the directory for the installed CLooG
|
||||
@ -5609,7 +5608,15 @@ fi
|
||||
|
||||
|
||||
|
||||
# Check for ISL
|
||||
# GCC GRAPHITE dependences, ISL and CLOOG which in turn requires ISL.
|
||||
# Basic setup is inlined here, actual checks are in config/cloog.m4 and
|
||||
# config/isl.m4
|
||||
|
||||
|
||||
# Check whether --with-cloog was given.
|
||||
if test "${with_cloog+set}" = set; then :
|
||||
withval=$with_cloog;
|
||||
fi
|
||||
|
||||
|
||||
# Check whether --with-isl was given.
|
||||
@ -5618,6 +5625,13 @@ if test "${with_isl+set}" = set; then :
|
||||
fi
|
||||
|
||||
|
||||
# Treat either --without-cloog or --without-isl as a request to disable
|
||||
# GRAPHITE support and skip all following checks.
|
||||
if test "x$with_isl" != "xno" &&
|
||||
test "x$with_cloog" != "xno"; then
|
||||
# Check for ISL
|
||||
|
||||
|
||||
# Check whether --with-isl-include was given.
|
||||
if test "${with_isl_include+set}" = set; then :
|
||||
withval=$with_isl_include;
|
||||
@ -5664,14 +5678,8 @@ fi
|
||||
ENABLE_ISL_CHECK=no
|
||||
fi
|
||||
|
||||
isllibs="${isllibs} -lisl"
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
if test "x$with_isl" != "xno"; then
|
||||
|
||||
if test "${ENABLE_ISL_CHECK}" = yes ; then
|
||||
_isl_saved_CFLAGS=$CFLAGS
|
||||
_isl_saved_LDFLAGS=$LDFLAGS
|
||||
@ -5727,7 +5735,6 @@ $as_echo "$gcc_cv_isl" >&6; }
|
||||
|
||||
|
||||
|
||||
|
||||
if test "x${with_isl}" = xno; then
|
||||
graphite_requested=no
|
||||
elif test "x${with_isl}" != x \
|
||||
@ -5753,15 +5760,9 @@ $as_echo "$gcc_cv_isl" >&6; }
|
||||
fi
|
||||
|
||||
|
||||
fi
|
||||
|
||||
# Check for CLOOG
|
||||
|
||||
|
||||
# Check whether --with-cloog was given.
|
||||
if test "${with_cloog+set}" = set; then :
|
||||
withval=$with_cloog;
|
||||
fi
|
||||
if test "x$gcc_cv_isl" != "xno"; then
|
||||
# Check for CLOOG
|
||||
|
||||
|
||||
# Check whether --with-cloog-include was given.
|
||||
@ -5810,19 +5811,12 @@ fi
|
||||
fi
|
||||
|
||||
clooginc="-DCLOOG_INT_GMP ${clooginc}"
|
||||
clooglibs="${clooglibs} -lcloog-isl ${isllibs}"
|
||||
clooglibs="${clooglibs} -lcloog-isl ${isllibs} -lisl"
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
if test "x$isllibs" = x && test "x$islinc" = x; then
|
||||
clooglibs=
|
||||
clooginc=
|
||||
elif test "x$with_cloog" != "xno"; then
|
||||
|
||||
|
||||
|
||||
if test "${ENABLE_CLOOG_CHECK}" = yes ; then
|
||||
_cloog_saved_CFLAGS=$CFLAGS
|
||||
_cloog_saved_LDFLAGS=$LDFLAGS
|
||||
@ -5891,18 +5885,30 @@ $as_echo "$gcc_cv_cloog" >&6; }
|
||||
&& test "x${clooglibs}" = x \
|
||||
&& test "x${clooginc}" = x ; then
|
||||
|
||||
as_fn_error "Unable to find a usable CLooG. See config.log for details." "$LINENO" 5
|
||||
as_fn_error "Unable to find a usable CLooG. See config.log for details." "$LINENO" 5
|
||||
fi
|
||||
|
||||
|
||||
fi
|
||||
fi
|
||||
|
||||
# If either the ISL or the CLooG check failed, disable builds of in-tree
|
||||
# variants of both
|
||||
if test "x$clooglibs" = x && test "x$clooginc" = x; then
|
||||
if test "x$with_isl" = xno ||
|
||||
test "x$with_cloog" = xno ||
|
||||
test "x$gcc_cv_cloog" = xno ||
|
||||
test "x$gcc_cv_isl" = xno; then
|
||||
noconfigdirs="$noconfigdirs cloog isl"
|
||||
islinc=
|
||||
clooginc=
|
||||
clooglibs=
|
||||
fi
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
# Check for LTO support.
|
||||
# Check whether --enable-lto was given.
|
||||
if test "${enable_lto+set}" = set; then :
|
||||
|
||||
75
configure.ac
75
configure.ac
@ -1513,44 +1513,71 @@ AC_ARG_WITH(boot-ldflags,
|
||||
fi])
|
||||
AC_SUBST(poststage1_ldflags)
|
||||
|
||||
# Check for ISL
|
||||
dnl Provide configure switches and initialize islinc & isllibs
|
||||
dnl with user input.
|
||||
ISL_INIT_FLAGS
|
||||
if test "x$with_isl" != "xno"; then
|
||||
# GCC GRAPHITE dependences, ISL and CLOOG which in turn requires ISL.
|
||||
# Basic setup is inlined here, actual checks are in config/cloog.m4 and
|
||||
# config/isl.m4
|
||||
|
||||
AC_ARG_WITH(cloog,
|
||||
[AS_HELP_STRING(
|
||||
[--with-cloog=PATH],
|
||||
[Specify prefix directory for the installed CLooG-ISL package.
|
||||
Equivalent to --with-cloog-include=PATH/include
|
||||
plus --with-cloog-lib=PATH/lib])])
|
||||
AC_ARG_WITH(isl,
|
||||
[AS_HELP_STRING(
|
||||
[--with-isl=PATH],
|
||||
[Specify prefix directory for the installed ISL package.
|
||||
Equivalent to --with-isl-include=PATH/include
|
||||
plus --with-isl-lib=PATH/lib])])
|
||||
|
||||
# Treat either --without-cloog or --without-isl as a request to disable
|
||||
# GRAPHITE support and skip all following checks.
|
||||
if test "x$with_isl" != "xno" &&
|
||||
test "x$with_cloog" != "xno"; then
|
||||
# Check for ISL
|
||||
dnl Provide configure switches and initialize islinc & isllibs
|
||||
dnl with user input.
|
||||
ISL_INIT_FLAGS
|
||||
dnl The minimal version of ISL required for Graphite.
|
||||
ISL_CHECK_VERSION(0,10)
|
||||
|
||||
dnl Only execute fail-action, if ISL has been requested.
|
||||
ISL_IF_FAILED([
|
||||
AC_MSG_ERROR([Unable to find a usable ISL. See config.log for details.])])
|
||||
fi
|
||||
|
||||
# Check for CLOOG
|
||||
dnl Provide configure switches and initialize clooginc & clooglibs
|
||||
dnl with user input.
|
||||
CLOOG_INIT_FLAGS
|
||||
if test "x$isllibs" = x && test "x$islinc" = x; then
|
||||
clooglibs=
|
||||
clooginc=
|
||||
elif test "x$with_cloog" != "xno"; then
|
||||
dnl The minimal version of CLooG required for Graphite.
|
||||
dnl
|
||||
dnl If we use CLooG-Legacy, the provided version information is
|
||||
dnl ignored.
|
||||
CLOOG_CHECK_VERSION(0,17,0)
|
||||
if test "x$gcc_cv_isl" != "xno"; then
|
||||
# Check for CLOOG
|
||||
dnl Provide configure switches and initialize clooginc & clooglibs
|
||||
dnl with user input.
|
||||
CLOOG_INIT_FLAGS
|
||||
dnl The minimal version of CLooG required for Graphite.
|
||||
dnl
|
||||
dnl If we use CLooG-Legacy, the provided version information is
|
||||
dnl ignored.
|
||||
CLOOG_CHECK_VERSION(0,17,0)
|
||||
|
||||
dnl Only execute fail-action, if CLooG has been requested.
|
||||
CLOOG_IF_FAILED([
|
||||
AC_MSG_ERROR([Unable to find a usable CLooG. See config.log for details.])])
|
||||
dnl Only execute fail-action, if CLooG has been requested.
|
||||
CLOOG_IF_FAILED([
|
||||
AC_MSG_ERROR([Unable to find a usable CLooG. See config.log for details.])])
|
||||
fi
|
||||
fi
|
||||
|
||||
# If either the ISL or the CLooG check failed, disable builds of in-tree
|
||||
# variants of both
|
||||
if test "x$clooglibs" = x && test "x$clooginc" = x; then
|
||||
if test "x$with_isl" = xno ||
|
||||
test "x$with_cloog" = xno ||
|
||||
test "x$gcc_cv_cloog" = xno ||
|
||||
test "x$gcc_cv_isl" = xno; then
|
||||
noconfigdirs="$noconfigdirs cloog isl"
|
||||
islinc=
|
||||
clooginc=
|
||||
clooglibs=
|
||||
fi
|
||||
|
||||
AC_SUBST(islinc)
|
||||
AC_SUBST(clooglibs)
|
||||
AC_SUBST(clooginc)
|
||||
|
||||
|
||||
# Check for LTO support.
|
||||
AC_ARG_ENABLE(lto,
|
||||
[AS_HELP_STRING([--enable-lto], [enable link time optimization support])],
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user