[pkgsrc/trunk]: pkgsrc/lang/gcc10 gcc10: fix building for any zlib

[adam <adam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/1055914ff12c
branches:  trunk
changeset: 450830:1055914ff12c
user:      adam <adam%pkgsrc.org@localhost>
date:      Thu Apr 22 12:08:16 2021 +0000

description:
gcc10: fix building for any zlib

diffstat:

 lang/gcc10/Makefile |  13 +++----------
 1 files changed, 3 insertions(+), 10 deletions(-)

diffs (35 lines):

diff -r d7076569909b -r 1055914ff12c lang/gcc10/Makefile
--- a/lang/gcc10/Makefile       Thu Apr 22 12:06:54 2021 +0000
+++ b/lang/gcc10/Makefile       Thu Apr 22 12:08:16 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2021/04/16 15:03:42 ryoon Exp $
+# $NetBSD: Makefile,v 1.10 2021/04/22 12:08:16 adam Exp $
 
 GCC_PKGNAME=           gcc10
 .include               "version.mk"
@@ -103,6 +103,8 @@
 CONFIGURE_ARGS+=       --with-local-prefix=${GCC_PREFIX:Q}
 CONFIGURE_ARGS+=       --enable-threads=posix
 CONFIGURE_ARGS+=       --with-boot-ldflags=${BOOT_LDFLAGS:Q}
+CONFIGURE_ARGS+=       --with-system-zlib
+CONFIGURE_ARGS+=       --without-zstd
 # multilib on Darwin requires fat-binaries
 CONFIGURE_ARGS.Darwin+=        --disable-multilib
 .if !empty(OSX_SDK_PATH)
@@ -190,16 +192,7 @@
        cd ${DESTDIR}${PREFIX} && \
        ${FIND} ${GCC_SUBPREFIX} \( -type f -o -type l \) -print | ${SORT};
 
-CONFIGURE_ARGS+=       --without-zstd
-CHECK_BUILTIN.zlib:=   yes
-.include "../../devel/zlib/builtin.mk"
-CHECK_BUILTIN.zlib:=   no
-.if !empty(USE_BUILTIN.zlib:M[yY][eE][sS])
-CONFIGURE_ARGS+=       --with-system-zlib
 .include "../../devel/zlib/buildlink3.mk"
-.else
-CONFIGURE_ARGS+=       --without-system-zlib
-.endif
 .include "../../mk/dlopen.buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"