Hi! On Thu, 30 Oct 2014 11:10:51 +0100, I wrote: > Build a shared host libiberty also for libcc1's benefit.
Backported to gomp-4_0-branch in r216918:
commit 595db85c7323b08d29bf344911a7bd709d68685b
Author: tschwinge <tschwinge@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Thu Oct 30 11:09:14 2014 +0000
Build a shared host libiberty also for libcc1's benefit.
Backport trunk r216912:
* configure.ac (extra_host_libiberty_configure_flags): Add
--enable-shared also for libcc1's benefit.
* configure: Regenerate.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gomp-4_0-branch@216918
138bc75d-0d04-0410-961f-82ee72b054a4
---
ChangeLog.gomp | 8 ++++++++
configure | 16 ++++++++++++----
configure.ac | 14 +++++++++++---
3 files changed, 31 insertions(+), 7 deletions(-)
diff --git ChangeLog.gomp ChangeLog.gomp
index 10a0ed7..446329e 100644
--- ChangeLog.gomp
+++ ChangeLog.gomp
@@ -1,3 +1,11 @@
+2014-10-30 Thomas Schwinge <tho...@codesourcery.com>
+
+ Backport trunk r216912:
+
+ * configure.ac (extra_host_libiberty_configure_flags): Add
+ --enable-shared also for libcc1's benefit.
+ * configure: Regenerate.
+
2014-10-17 Julian Brown <jul...@codesourcery.com>
* gomp-constants.h: New file.
diff --git configure configure
index 18781f8..96ee349 100755
--- configure
+++ configure
@@ -642,8 +642,8 @@ CXXFLAGS_FOR_TARGET
CFLAGS_FOR_TARGET
DEBUG_PREFIX_CFLAGS_FOR_TARGET
SYSROOT_CFLAGS_FOR_TARGET
-stage1_languages
extra_host_libiberty_configure_flags
+stage1_languages
extra_linker_plugin_flags
extra_linker_plugin_configure_flags
clooginc
@@ -6274,7 +6274,6 @@ if test -d ${srcdir}/gcc; then
new_enable_languages=,c,
# If LTO is enabled, add the LTO front end.
- extra_host_libiberty_configure_flags=
if test "$enable_lto" = "yes" ; then
case ,${enable_languages}, in
*,lto,*) ;;
@@ -6282,11 +6281,9 @@ if test -d ${srcdir}/gcc; then
esac
if test "${build_lto_plugin}" = "yes" ; then
configdirs="$configdirs lto-plugin"
- extra_host_libiberty_configure_flags=--enable-shared
fi
fi
-
missing_languages=`echo ",$enable_languages," | sed -e s/,all,/,/ -e
s/,c,/,/ `
potential_languages=,c,
@@ -6599,6 +6596,17 @@ then
esac
fi
+# Sometimes we have special requirements for the host libiberty.
+extra_host_libiberty_configure_flags=
+case " $configdirs " in
+ *" lto-plugin "* | *" libcc1 "*)
+ # When these are to be built as shared libraries, the same applies to
+ # libiberty.
+ extra_host_libiberty_configure_flags=--enable-shared
+ ;;
+esac
+
+
# Produce a warning message for the subdirs we can't configure.
# This isn't especially interesting in the Cygnus tree, but in the individual
# FSF releases, it's important to let people know when their machine isn't
diff --git configure.ac configure.ac
index 20dbcbc..7b24958 100644
--- configure.ac
+++ configure.ac
@@ -1861,7 +1861,6 @@ if test -d ${srcdir}/gcc; then
new_enable_languages=,c,
# If LTO is enabled, add the LTO front end.
- extra_host_libiberty_configure_flags=
if test "$enable_lto" = "yes" ; then
case ,${enable_languages}, in
*,lto,*) ;;
@@ -1869,10 +1868,8 @@ if test -d ${srcdir}/gcc; then
esac
if test "${build_lto_plugin}" = "yes" ; then
configdirs="$configdirs lto-plugin"
- extra_host_libiberty_configure_flags=--enable-shared
fi
fi
- AC_SUBST(extra_host_libiberty_configure_flags)
missing_languages=`echo ",$enable_languages," | sed -e s/,all,/,/ -e
s/,c,/,/ `
potential_languages=,c,
@@ -2186,6 +2183,17 @@ then
esac
fi
+# Sometimes we have special requirements for the host libiberty.
+extra_host_libiberty_configure_flags=
+case " $configdirs " in
+ *" lto-plugin "* | *" libcc1 "*)
+ # When these are to be built as shared libraries, the same applies to
+ # libiberty.
+ extra_host_libiberty_configure_flags=--enable-shared
+ ;;
+esac
+AC_SUBST(extra_host_libiberty_configure_flags)
+
# Produce a warning message for the subdirs we can't configure.
# This isn't especially interesting in the Cygnus tree, but in the individual
# FSF releases, it's important to let people know when their machine isn't
Grüße,
Thomas
pgp2sfK4vhc6I.pgp
Description: PGP signature
