aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Schwinge <thomas@codesourcery.com>2014-12-15 11:54:43 +0100
committerThomas Schwinge <tschwinge@gcc.gnu.org>2014-12-15 11:54:43 +0100
commit4b4f2e35d0d71a758079bf11e485f737e7f2b8cf (patch)
treef1633194d56de9a4f584d7032e71716884ae880f
parentf84e7f45f7f8967c82284dc27b545c6fdce6a75b (diff)
downloadgcc-4b4f2e35d0d71a758079bf11e485f737e7f2b8cf.zip
gcc-4b4f2e35d0d71a758079bf11e485f737e7f2b8cf.tar.gz
gcc-4b4f2e35d0d71a758079bf11e485f737e7f2b8cf.tar.bz2
Build machinery cleanup.
* configure.ac (--enable-as-accelerator-for): Don't set ENABLE_AS_ACCELERATOR_FOR. Update all users. * configure: Regenerate. From-SVN: r218744
-rw-r--r--ChangeLog6
-rwxr-xr-xconfigure6
-rw-r--r--configure.ac6
3 files changed, 10 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index 8236370..861d016 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2014-12-15 Thomas Schwinge <thomas@codesourcery.com>
+
+ * configure.ac (--enable-as-accelerator-for): Don't set
+ ENABLE_AS_ACCELERATOR_FOR. Update all users.
+ * configure: Regenerate.
+
2014-12-13 Jakub Jelinek <jakub@redhat.com>
PR bootstrap/64023
diff --git a/configure b/configure
index 297f38e..1804198 100755
--- a/configure
+++ b/configure
@@ -2893,9 +2893,7 @@ esac
# Check whether --enable-as-accelerator-for was given.
if test "${enable_as_accelerator_for+set}" = set; then :
- enableval=$enable_as_accelerator_for; ENABLE_AS_ACCELERATOR_FOR=$enableval
-else
- ENABLE_AS_ACCELERATOR_FOR=no
+ enableval=$enable_as_accelerator_for;
fi
@@ -3094,7 +3092,7 @@ if test "${enable_liboffloadmic+set}" = set; then :
as_fn_error "--enable-liboffloadmic=no/host/target" "$LINENO" 5 ;;
esac
else
- if test "${ENABLE_AS_ACCELERATOR_FOR}" != "no"; then
+ if test x"$enable_as_accelerator_for" != x; then
case "${target}" in
*-intelmic-* | *-intelmicemul-*)
enable_liboffloadmic=target
diff --git a/configure.ac b/configure.ac
index fd1bdf0..91c9a72 100644
--- a/configure.ac
+++ b/configure.ac
@@ -289,9 +289,7 @@ esac
AC_ARG_ENABLE(as-accelerator-for,
[AS_HELP_STRING([--enable-as-accelerator-for=ARG],
[build as offload target compiler.
- Specify offload host triple by ARG])],
-ENABLE_AS_ACCELERATOR_FOR=$enableval,
-ENABLE_AS_ACCELERATOR_FOR=no)
+ Specify offload host triple by ARG])])
AC_ARG_ENABLE(offload-targets,
[AS_HELP_STRING([--enable-offload-targets=LIST],
@@ -470,7 +468,7 @@ AC_HELP_STRING([[--enable-liboffloadmic[=ARG]]],
*)
AC_MSG_ERROR([--enable-liboffloadmic=no/host/target]) ;;
esac],
-[if test "${ENABLE_AS_ACCELERATOR_FOR}" != "no"; then
+[if test x"$enable_as_accelerator_for" != x; then
case "${target}" in
*-intelmic-* | *-intelmicemul-*)
enable_liboffloadmic=target