[PATCH] Disable all target libraries if not building gcc

[PATCH] Disable all target libraries if not building gcc

[H.J. Lu]

I am working on SHF_COMPRESSED support:

http://www.sco.com/developers/gabi/latest/ch4.sheader.html

I will import zlib from GCC source tree into binutils-gdb tree.  But zlib
failed to build as a target library in binutils-gdb.  There is no need to
build target libraries if not building gcc.  OK for master?

Thanks.


H.J.
---
	* configure.ac (target_configdirs): Clear if if not building gcc.
	* configure: Regenerated.
---
 configure    | 3 +++
 configure.ac | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/configure b/configure
index d075cf3..5caf82b 100755
--- a/configure
+++ b/configure
@@ -6614,6 +6614,9 @@ Supported languages are: ${potential_languages}" "$LINENO" 5
 
 
   ac_configure_args=`echo " $ac_configure_args" | sed -e "s/ '--enable-languages=[^ ]*'//g" -e "s/$/ '--enable-languages="$enable_languages"'/" `
+else
+  # Disable all target libraries if not building gcc.
+  target_configdirs=
 fi
 
 # Handle --disable-<component> generically.
diff --git a/configure.ac b/configure.ac
index 5ff56bf..34774d8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2039,6 +2039,9 @@ Supported languages are: ${potential_languages}])
 
   AC_SUBST(stage1_languages)
   ac_configure_args=`echo " $ac_configure_args" | sed -e "s/ '--enable-languages=[[^ ]]*'//g" -e "s/$/ '--enable-languages="$enable_languages"'/" `
+else
+  # Disable all target libraries if not building gcc.
+  target_configdirs=
 fi
 
 # Handle --disable-<component> generically.
-- 
1.9.3

Re: [PATCH] Disable all target libraries if not building gcc

[Joseph Myers]

On Fri, 13 Mar 2015, H.J. Lu wrote:

> I am working on SHF_COMPRESSED support:
> 
> http://www.sco.com/developers/gabi/latest/ch4.sheader.html
> 
> I will import zlib from GCC source tree into binutils-gdb tree.  But zlib
> failed to build as a target library in binutils-gdb.  There is no need to
> build target libraries if not building gcc.  OK for master?

This is definitely wrong.  newlib / libgloss is a target library that 
certainly makes sense to build separately from GCC, and the toplevel 
configure / build code should be identical in all three repositories (GCC, 
binutils-gdb, newlib-cygwin).

-- 
Joseph S. Myers
joseph@codesourcery.com

Re: [PATCH] Disable all target libraries if not building gcc

[H.J. Lu]

On Mon, Mar 16, 2015 at 3:50 PM, Joseph Myers <joseph@codesourcery.com> wrote:
> On Fri, 13 Mar 2015, H.J. Lu wrote:
>
>> I am working on SHF_COMPRESSED support:
>>
>> http://www.sco.com/developers/gabi/latest/ch4.sheader.html
>>
>> I will import zlib from GCC source tree into binutils-gdb tree.  But zlib
>> failed to build as a target library in binutils-gdb.  There is no need to
>> build target libraries if not building gcc.  OK for master?
>
> This is definitely wrong.  newlib / libgloss is a target library that
> certainly makes sense to build separately from GCC, and the toplevel
> configure / build code should be identical in all three repositories (GCC,
> binutils-gdb, newlib-cygwin).
>

We need to work out something to avoid building target libraries
in binutils.

-- 
H.J.

Re: [PATCH] Disable all target libraries if not building gcc

[Joseph Myers]

On Mon, 16 Mar 2015, H.J. Lu wrote:

> On Mon, Mar 16, 2015 at 3:50 PM, Joseph Myers <joseph@codesourcery.com> wrote:
> > On Fri, 13 Mar 2015, H.J. Lu wrote:
> >
> >> I am working on SHF_COMPRESSED support:
> >>
> >> http://www.sco.com/developers/gabi/latest/ch4.sheader.html
> >>
> >> I will import zlib from GCC source tree into binutils-gdb tree.  But zlib
> >> failed to build as a target library in binutils-gdb.  There is no need to
> >> build target libraries if not building gcc.  OK for master?
> >
> > This is definitely wrong.  newlib / libgloss is a target library that
> > certainly makes sense to build separately from GCC, and the toplevel
> > configure / build code should be identical in all three repositories (GCC,
> > binutils-gdb, newlib-cygwin).
> 
> We need to work out something to avoid building target libraries
> in binutils.

I suggest not building zlib as a target library unless libgcj is also 
being built as a target library, given that there should be no need to 
built it as a target library in isolation.

It can be useful to build even GCC's target libraries when not building 
GCC (for example, rebuilding them with different optimization options 
using an installed compiler) - for libraries that don't use the host-side 
tm.h (all except libgcc and libobjc, I think), this is practical.

-- 
Joseph S. Myers
joseph@codesourcery.com

Re: [PATCH] Disable all target libraries if not building gcc

[H.J. Lu]

On Mon, Mar 16, 2015 at 4:41 PM, Joseph Myers <joseph@codesourcery.com> wrote:
> On Mon, 16 Mar 2015, H.J. Lu wrote:
>
>> On Mon, Mar 16, 2015 at 3:50 PM, Joseph Myers <joseph@codesourcery.com> wrote:
>> > On Fri, 13 Mar 2015, H.J. Lu wrote:
>> >
>> >> I am working on SHF_COMPRESSED support:
>> >>
>> >> http://www.sco.com/developers/gabi/latest/ch4.sheader.html
>> >>
>> >> I will import zlib from GCC source tree into binutils-gdb tree.  But zlib
>> >> failed to build as a target library in binutils-gdb.  There is no need to
>> >> build target libraries if not building gcc.  OK for master?
>> >
>> > This is definitely wrong.  newlib / libgloss is a target library that
>> > certainly makes sense to build separately from GCC, and the toplevel
>> > configure / build code should be identical in all three repositories (GCC,
>> > binutils-gdb, newlib-cygwin).
>>
>> We need to work out something to avoid building target libraries
>> in binutils.
>
> I suggest not building zlib as a target library unless libgcj is also
> being built as a target library, given that there should be no need to
> built it as a target library in isolation.
>

The logic is there.  But somehow it doesn't work for binutils.
I will take another look.

-- 
H.J.

Re: [PATCH] Disable all target libraries if not building gcc

[H.J. Lu]

[-- Attachment #1: Type: text/plain, Size: 1463 bytes --]

On Mon, Mar 16, 2015 at 4:43 PM, H.J. Lu <hjl.tools@gmail.com> wrote:
> On Mon, Mar 16, 2015 at 4:41 PM, Joseph Myers <joseph@codesourcery.com> wrote:
>> On Mon, 16 Mar 2015, H.J. Lu wrote:
>>
>>> On Mon, Mar 16, 2015 at 3:50 PM, Joseph Myers <joseph@codesourcery.com> wrote:
>>> > On Fri, 13 Mar 2015, H.J. Lu wrote:
>>> >
>>> >> I am working on SHF_COMPRESSED support:
>>> >>
>>> >> http://www.sco.com/developers/gabi/latest/ch4.sheader.html
>>> >>
>>> >> I will import zlib from GCC source tree into binutils-gdb tree.  But zlib
>>> >> failed to build as a target library in binutils-gdb.  There is no need to
>>> >> build target libraries if not building gcc.  OK for master?
>>> >
>>> > This is definitely wrong.  newlib / libgloss is a target library that
>>> > certainly makes sense to build separately from GCC, and the toplevel
>>> > configure / build code should be identical in all three repositories (GCC,
>>> > binutils-gdb, newlib-cygwin).
>>>
>>> We need to work out something to avoid building target libraries
>>> in binutils.
>>
>> I suggest not building zlib as a target library unless libgcj is also
>> being built as a target library, given that there should be no need to
>> built it as a target library in isolation.
>>
>
> The logic is there.  But somehow it doesn't work for binutils.
> I will take another look.
>

Here is a patch.  It excludes target-zlib if target-libjava isn't built.
Tested in binutils and GCC with java.


-- 
H.J.

[-- Attachment #2: zlib.patch --]
[-- Type: text/x-patch, Size: 1997 bytes --]

diff --git a/configure b/configure
index 9e54319..f9455e9 100755
--- a/configure
+++ b/configure
@@ -6432,9 +6432,6 @@ Supported languages are: ${potential_languages}" "$LINENO" 5
 
 
   ac_configure_args=`echo " $ac_configure_args" | sed -e "s/ '--enable-languages=[^ ]*'//g" -e "s/$/ '--enable-languages="$enable_languages"'/" `
-else
-  # Disable all target libraries if not building gcc.
-  target_configdirs=
 fi
 
 # Handle --disable-<component> generically.
@@ -6554,6 +6551,13 @@ for i in ${target_configdirs_all} ; do
   fi
 done
 
+# Exclude target-zlib if target-libjava isn't built.
+if echo " ${target_configdirs} " | grep "target-libjava" >/dev/null 2>&1; then
+  :
+else
+  target_configdirs="`echo ${target_configdirs} | sed -e 's/target-zlib//'`"
+fi
+
 # libiberty-linker-plugin is special: it doesn't have its own source directory,
 # so we have to add it after the preceding checks.
 if test x"$extra_linker_plugin_flags$extra_linker_plugin_configure_flags" != x
diff --git a/configure.ac b/configure.ac
index eaf4661..a5a0fd0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2129,9 +2129,6 @@ Supported languages are: ${potential_languages}])
 
   AC_SUBST(stage1_languages)
   ac_configure_args=`echo " $ac_configure_args" | sed -e "s/ '--enable-languages=[[^ ]]*'//g" -e "s/$/ '--enable-languages="$enable_languages"'/" `
-else
-  # Disable all target libraries if not building gcc.
-  target_configdirs=
 fi
 
 # Handle --disable-<component> generically.
@@ -2251,6 +2248,13 @@ for i in ${target_configdirs_all} ; do
   fi
 done
 
+# Exclude target-zlib if target-libjava isn't built.
+if echo " ${target_configdirs} " | grep "target-libjava" >/dev/null 2>&1; then
+  :
+else
+  target_configdirs="`echo ${target_configdirs} | sed -e 's/target-zlib//'`"
+fi
+
 # libiberty-linker-plugin is special: it doesn't have its own source directory,
 # so we have to add it after the preceding checks.
 if test x"$extra_linker_plugin_flags$extra_linker_plugin_configure_flags" != x

Re: [PATCH] Disable all target libraries if not building gcc

[H.J. Lu]

[-- Attachment #1: Type: text/plain, Size: 1666 bytes --]

On Mon, Mar 16, 2015 at 7:26 PM, H.J. Lu <hjl.tools@gmail.com> wrote:
> On Mon, Mar 16, 2015 at 4:43 PM, H.J. Lu <hjl.tools@gmail.com> wrote:
>> On Mon, Mar 16, 2015 at 4:41 PM, Joseph Myers <joseph@codesourcery.com> wrote:
>>> On Mon, 16 Mar 2015, H.J. Lu wrote:
>>>
>>>> On Mon, Mar 16, 2015 at 3:50 PM, Joseph Myers <joseph@codesourcery.com> wrote:
>>>> > On Fri, 13 Mar 2015, H.J. Lu wrote:
>>>> >
>>>> >> I am working on SHF_COMPRESSED support:
>>>> >>
>>>> >> http://www.sco.com/developers/gabi/latest/ch4.sheader.html
>>>> >>
>>>> >> I will import zlib from GCC source tree into binutils-gdb tree.  But zlib
>>>> >> failed to build as a target library in binutils-gdb.  There is no need to
>>>> >> build target libraries if not building gcc.  OK for master?
>>>> >
>>>> > This is definitely wrong.  newlib / libgloss is a target library that
>>>> > certainly makes sense to build separately from GCC, and the toplevel
>>>> > configure / build code should be identical in all three repositories (GCC,
>>>> > binutils-gdb, newlib-cygwin).
>>>>
>>>> We need to work out something to avoid building target libraries
>>>> in binutils.
>>>
>>> I suggest not building zlib as a target library unless libgcj is also
>>> being built as a target library, given that there should be no need to
>>> built it as a target library in isolation.
>>>
>>
>> The logic is there.  But somehow it doesn't work for binutils.
>> I will take another look.
>>
>
> Here is a patch.  It excludes target-zlib if target-libjava isn't built.
> Tested in binutils and GCC with java.
>

This version is more flexible to support future target libraries
which depend on target zlib.

-- 
H.J.

[-- Attachment #2: zlib.patch --]
[-- Type: text/x-patch, Size: 1194 bytes --]

diff --git a/configure b/configure
index 9e54319..b719d38 100755
--- a/configure
+++ b/configure
@@ -6554,6 +6551,15 @@ for i in ${target_configdirs_all} ; do
   fi
 done
 
+# Exclude target-zlib if target-libjava isn't built.
+case ${target_configdirs} in
+*target-libjava*)
+  ;;
+*)
+  target_configdirs="`echo ${target_configdirs} | sed -e 's/target-zlib//'`"
+  ;;
+esac
+
 # libiberty-linker-plugin is special: it doesn't have its own source directory,
 # so we have to add it after the preceding checks.
 if test x"$extra_linker_plugin_flags$extra_linker_plugin_configure_flags" != x
diff --git a/configure.ac b/configure.ac
index eaf4661..a4e4c7d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2251,6 +2248,15 @@ for i in ${target_configdirs_all} ; do
   fi
 done
 
+# Exclude target-zlib if target-libjava isn't built.
+case ${target_configdirs} in
+*target-libjava*)
+  ;;
+*)
+  target_configdirs="`echo ${target_configdirs} | sed -e 's/target-zlib//'`"
+  ;;
+esac
+
 # libiberty-linker-plugin is special: it doesn't have its own source directory,
 # so we have to add it after the preceding checks.
 if test x"$extra_linker_plugin_flags$extra_linker_plugin_configure_flags" != x

Re: [PATCH] Disable all target libraries if not building gcc

[H.J. Lu]

[-- Attachment #1: Type: text/plain, Size: 1837 bytes --]

On Mon, Mar 16, 2015 at 8:01 PM, H.J. Lu <hjl.tools@gmail.com> wrote:
> On Mon, Mar 16, 2015 at 7:26 PM, H.J. Lu <hjl.tools@gmail.com> wrote:
>> On Mon, Mar 16, 2015 at 4:43 PM, H.J. Lu <hjl.tools@gmail.com> wrote:
>>> On Mon, Mar 16, 2015 at 4:41 PM, Joseph Myers <joseph@codesourcery.com> wrote:
>>>> On Mon, 16 Mar 2015, H.J. Lu wrote:
>>>>
>>>>> On Mon, Mar 16, 2015 at 3:50 PM, Joseph Myers <joseph@codesourcery.com> wrote:
>>>>> > On Fri, 13 Mar 2015, H.J. Lu wrote:
>>>>> >
>>>>> >> I am working on SHF_COMPRESSED support:
>>>>> >>
>>>>> >> http://www.sco.com/developers/gabi/latest/ch4.sheader.html
>>>>> >>
>>>>> >> I will import zlib from GCC source tree into binutils-gdb tree.  But zlib
>>>>> >> failed to build as a target library in binutils-gdb.  There is no need to
>>>>> >> build target libraries if not building gcc.  OK for master?
>>>>> >
>>>>> > This is definitely wrong.  newlib / libgloss is a target library that
>>>>> > certainly makes sense to build separately from GCC, and the toplevel
>>>>> > configure / build code should be identical in all three repositories (GCC,
>>>>> > binutils-gdb, newlib-cygwin).
>>>>>
>>>>> We need to work out something to avoid building target libraries
>>>>> in binutils.
>>>>
>>>> I suggest not building zlib as a target library unless libgcj is also
>>>> being built as a target library, given that there should be no need to
>>>> built it as a target library in isolation.
>>>>
>>>
>>> The logic is there.  But somehow it doesn't work for binutils.
>>> I will take another look.
>>>
>>
>> Here is a patch.  It excludes target-zlib if target-libjava isn't built.
>> Tested in binutils and GCC with java.
>>
>
> This version is more flexible to support future target libraries
> which depend on target zlib.
>

I reverted my previous commit and checked in this one.


-- 
H.J.

[-- Attachment #2: 0001-Exclude-target-zlib-if-target-libjava-isn-t-built.patch --]
[-- Type: text/x-patch, Size: 2841 bytes --]

From 54564569062ee2cc7690aa96323c0dc5622efeef Mon Sep 17 00:00:00 2001
From: "H.J. Lu" <hjl.tools@gmail.com>
Date: Tue, 17 Mar 2015 17:05:38 -0700
Subject: [PATCH] Exclude target-zlib if target-libjava isn't built

	* configure.ac (target_configdirs): Exclude target-zlib if
	target-libjava isn't built.
	* configure: Regenerated.
---
 ChangeLog    |  6 ++++++
 configure    | 12 +++++++++---
 configure.ac | 12 +++++++++---
 3 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index f018cc4..9b1895b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2015-03-17  H.J. Lu  <hongjiu.lu@intel.com>
 
+	* configure.ac (target_configdirs): Exclude target-zlib if
+	target-libjava isn't built.
+	* configure: Regenerated.
+
+2015-03-17  H.J. Lu  <hongjiu.lu@intel.com>
+
 	Sync with GCC
 	2014-06-13  Thomas Schwinge  <thomas@codesourcery.com>
 
diff --git a/configure b/configure
index 9e54319..b719d38 100755
--- a/configure
+++ b/configure
@@ -6432,9 +6432,6 @@ Supported languages are: ${potential_languages}" "$LINENO" 5
 
 
   ac_configure_args=`echo " $ac_configure_args" | sed -e "s/ '--enable-languages=[^ ]*'//g" -e "s/$/ '--enable-languages="$enable_languages"'/" `
-else
-  # Disable all target libraries if not building gcc.
-  target_configdirs=
 fi
 
 # Handle --disable-<component> generically.
@@ -6554,6 +6551,15 @@ for i in ${target_configdirs_all} ; do
   fi
 done
 
+# Exclude target-zlib if target-libjava isn't built.
+case ${target_configdirs} in
+*target-libjava*)
+  ;;
+*)
+  target_configdirs="`echo ${target_configdirs} | sed -e 's/target-zlib//'`"
+  ;;
+esac
+
 # libiberty-linker-plugin is special: it doesn't have its own source directory,
 # so we have to add it after the preceding checks.
 if test x"$extra_linker_plugin_flags$extra_linker_plugin_configure_flags" != x
diff --git a/configure.ac b/configure.ac
index eaf4661..a4e4c7d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2129,9 +2129,6 @@ Supported languages are: ${potential_languages}])
 
   AC_SUBST(stage1_languages)
   ac_configure_args=`echo " $ac_configure_args" | sed -e "s/ '--enable-languages=[[^ ]]*'//g" -e "s/$/ '--enable-languages="$enable_languages"'/" `
-else
-  # Disable all target libraries if not building gcc.
-  target_configdirs=
 fi
 
 # Handle --disable-<component> generically.
@@ -2251,6 +2248,15 @@ for i in ${target_configdirs_all} ; do
   fi
 done
 
+# Exclude target-zlib if target-libjava isn't built.
+case ${target_configdirs} in
+*target-libjava*)
+  ;;
+*)
+  target_configdirs="`echo ${target_configdirs} | sed -e 's/target-zlib//'`"
+  ;;
+esac
+
 # libiberty-linker-plugin is special: it doesn't have its own source directory,
 # so we have to add it after the preceding checks.
 if test x"$extra_linker_plugin_flags$extra_linker_plugin_configure_flags" != x
-- 
2.1.0

Re: [PATCH] Disable all target libraries if not building gcc

[H.J. Lu]

[-- Attachment #1: Type: text/plain, Size: 1984 bytes --]

On Tue, Mar 17, 2015 at 5:08 PM, H.J. Lu <hjl.tools@gmail.com> wrote:
> On Mon, Mar 16, 2015 at 8:01 PM, H.J. Lu <hjl.tools@gmail.com> wrote:
>> On Mon, Mar 16, 2015 at 7:26 PM, H.J. Lu <hjl.tools@gmail.com> wrote:
>>> On Mon, Mar 16, 2015 at 4:43 PM, H.J. Lu <hjl.tools@gmail.com> wrote:
>>>> On Mon, Mar 16, 2015 at 4:41 PM, Joseph Myers <joseph@codesourcery.com> wrote:
>>>>> On Mon, 16 Mar 2015, H.J. Lu wrote:
>>>>>
>>>>>> On Mon, Mar 16, 2015 at 3:50 PM, Joseph Myers <joseph@codesourcery.com> wrote:
>>>>>> > On Fri, 13 Mar 2015, H.J. Lu wrote:
>>>>>> >
>>>>>> >> I am working on SHF_COMPRESSED support:
>>>>>> >>
>>>>>> >> http://www.sco.com/developers/gabi/latest/ch4.sheader.html
>>>>>> >>
>>>>>> >> I will import zlib from GCC source tree into binutils-gdb tree.  But zlib
>>>>>> >> failed to build as a target library in binutils-gdb.  There is no need to
>>>>>> >> build target libraries if not building gcc.  OK for master?
>>>>>> >
>>>>>> > This is definitely wrong.  newlib / libgloss is a target library that
>>>>>> > certainly makes sense to build separately from GCC, and the toplevel
>>>>>> > configure / build code should be identical in all three repositories (GCC,
>>>>>> > binutils-gdb, newlib-cygwin).
>>>>>>
>>>>>> We need to work out something to avoid building target libraries
>>>>>> in binutils.
>>>>>
>>>>> I suggest not building zlib as a target library unless libgcj is also
>>>>> being built as a target library, given that there should be no need to
>>>>> built it as a target library in isolation.
>>>>>
>>>>
>>>> The logic is there.  But somehow it doesn't work for binutils.
>>>> I will take another look.
>>>>
>>>
>>> Here is a patch.  It excludes target-zlib if target-libjava isn't built.
>>> Tested in binutils and GCC with java.
>>>
>>
>> This version is more flexible to support future target libraries
>> which depend on target zlib.
>>
>
> I reverted my previous commit and checked in this one.
>

I am checking this into GCC.


-- 
H.J.

[-- Attachment #2: 0001-Sync-toplevel-configure-with-binutils-gdb.patch --]
[-- Type: text/x-patch, Size: 2275 bytes --]

From e8c4c38a1cbbaa6105dab86c2c7a3f597c498632 Mon Sep 17 00:00:00 2001
From: "H.J. Lu" <hjl.tools@gmail.com>
Date: Tue, 14 Jul 2015 08:29:32 -0700
Subject: [PATCH] Sync toplevel configure with binutils-gdb

	Sync with binutils-gdb:
	2015-03-17  H.J. Lu  <hongjiu.lu@intel.com>

	* configure.ac (target_configdirs): Exclude target-zlib if
	target-libjava isn't built.
	* configure: Regenerated.
---
 ChangeLog    | 9 +++++++++
 configure    | 9 +++++++++
 configure.ac | 9 +++++++++
 3 files changed, 27 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 27edb46..c1582b9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,15 @@
 2015-07-14  H.J. Lu  <hongjiu.lu@intel.com>
 
 	Sync with binutils-gdb:
+	2015-03-17  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* configure.ac (target_configdirs): Exclude target-zlib if
+	target-libjava isn't built.
+	* configure: Regenerated.
+
+2015-07-14  H.J. Lu  <hongjiu.lu@intel.com>
+
+	Sync with binutils-gdb:
 	2015-05-13  John David Anglin  <dave.anglin@bell.net>
 
 	* configure.ac: Disable configuration of GDB for HPUX targets.
diff --git a/configure b/configure
index f060986..5ba9489 100755
--- a/configure
+++ b/configure
@@ -6575,6 +6575,15 @@ for i in ${target_configdirs_all} ; do
   fi
 done
 
+# Exclude target-zlib if target-libjava isn't built.
+case ${target_configdirs} in
+*target-libjava*)
+  ;;
+*)
+  target_configdirs="`echo ${target_configdirs} | sed -e 's/target-zlib//'`"
+  ;;
+esac
+
 # libiberty-linker-plugin is special: it doesn't have its own source directory,
 # so we have to add it after the preceding checks.
 if test x"$extra_linker_plugin_flags$extra_linker_plugin_configure_flags" != x
diff --git a/configure.ac b/configure.ac
index 603bdf6..2ff9be0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2265,6 +2265,15 @@ for i in ${target_configdirs_all} ; do
   fi
 done
 
+# Exclude target-zlib if target-libjava isn't built.
+case ${target_configdirs} in
+*target-libjava*)
+  ;;
+*)
+  target_configdirs="`echo ${target_configdirs} | sed -e 's/target-zlib//'`"
+  ;;
+esac
+
 # libiberty-linker-plugin is special: it doesn't have its own source directory,
 # so we have to add it after the preceding checks.
 if test x"$extra_linker_plugin_flags$extra_linker_plugin_configure_flags" != x
-- 
2.4.3