CVS commit: pkgsrc/lang/gcc10

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Thu Apr 22 12:08:16 UTC 2021

Modified Files:
        pkgsrc/lang/gcc10: Makefile

Log Message:
gcc10: fix building for any zlib


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 pkgsrc/lang/gcc10/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/lang/gcc10/Makefile
diff -u pkgsrc/lang/gcc10/Makefile:1.9 pkgsrc/lang/gcc10/Makefile:1.10
--- pkgsrc/lang/gcc10/Makefile:1.9      Fri Apr 16 15:03:42 2021
+++ pkgsrc/lang/gcc10/Makefile  Thu Apr 22 12:08:16 2021
@@ -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+=    --enable-long-long
 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 @@ GENERATE_PLIST+= \
        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"