diff mbox series

RFA: Restore ability to build zlib in a srcdir == builddir

Message ID 87wouwtp1s.fsf@redhat.com
State New
Headers show
Series RFA: Restore ability to build zlib in a srcdir == builddir | expand

Commit Message

Nick Clifton June 18, 2018, 9:35 a.m. UTC
Hi Guys,

  The patch below allows the zlib library to be built when the build
  directory is the same as the source directory.  This patch has been in
  the binutils/gdb sources for a while now, but unfortunately was never
  copied to gcc.  So I am trying to right that mistake now.

  OK to apply ?

Cheers
  Nick

./ChangeLog
	* zlib/configure.ac: Restore old behaviour of only enabling
        multilibs when a target subdirectory is defined.  This allows
        building with srcdir == builddir.
	* zlib/configure: Regenerate.

Comments

Jason Merrill June 19, 2018, 1:44 a.m. UTC | #1
OK.

On Mon, Jun 18, 2018 at 5:35 AM, Nick Clifton <nickc@redhat.com> wrote:
> Hi Guys,
>
>   The patch below allows the zlib library to be built when the build
>   directory is the same as the source directory.  This patch has been in
>   the binutils/gdb sources for a while now, but unfortunately was never
>   copied to gcc.  So I am trying to right that mistake now.
>
>   OK to apply ?
>
> Cheers
>   Nick
>
> ./ChangeLog
>         * zlib/configure.ac: Restore old behaviour of only enabling
>         multilibs when a target subdirectory is defined.  This allows
>         building with srcdir == builddir.
>         * zlib/configure: Regenerate.
>
> diff --git a/zlib/configure.ac b/zlib/configure.ac
> index fb8d943905..57d6fa56b6 100644
> --- a/zlib/configure.ac
> +++ b/zlib/configure.ac
> @@ -4,7 +4,9 @@ AC_PREREQ(2.64)
>  AC_INIT
>  AC_CONFIG_SRCDIR([zlib.h])
>
> -AM_ENABLE_MULTILIB(, ..)
> +if test -n "${with_target_subdir}"; then
> +  AM_ENABLE_MULTILIB(, ..)
> +fi
>
>  AC_CANONICAL_SYSTEM
diff mbox series

Patch

diff --git a/zlib/configure.ac b/zlib/configure.ac
index fb8d943905..57d6fa56b6 100644
--- a/zlib/configure.ac
+++ b/zlib/configure.ac
@@ -4,7 +4,9 @@  AC_PREREQ(2.64)
 AC_INIT
 AC_CONFIG_SRCDIR([zlib.h])
 
-AM_ENABLE_MULTILIB(, ..)
+if test -n "${with_target_subdir}"; then
+  AM_ENABLE_MULTILIB(, ..)
+fi
 
 AC_CANONICAL_SYSTEM