summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorH.J. Lu <hjl.tools@gmail.com>2015-03-17 17:05:38 -0700
committerH.J. Lu <hjl.tools@gmail.com>2015-03-17 17:07:22 -0700
commit091021faaa699c11dd50d9ff56d8713953666f65 (patch)
tree68fda6bf2e36093d43f941dde8d812f9dd9a2646 /configure
parentRevert "Disable all target libraries if not building gcc" (diff)
downloadbinutils-gdb-091021faaa699c11dd50d9ff56d8713953666f65.tar.gz
binutils-gdb-091021faaa699c11dd50d9ff56d8713953666f65.tar.bz2
binutils-gdb-091021faaa699c11dd50d9ff56d8713953666f65.zip
Exclude target-zlib if target-libjava isn't built
* configure.ac (target_configdirs): Exclude target-zlib if target-libjava isn't built. * configure: Regenerated.
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure12
1 files changed, 9 insertions, 3 deletions
diff --git a/configure b/configure
index 9e543196ea7..b719d386764 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