diff options
| author | adam <adam@pkgsrc.org> | 2021-04-22 12:08:16 +0000 |
|---|---|---|
| committer | adam <adam@pkgsrc.org> | 2021-04-22 12:08:16 +0000 |
| commit | 289329332b9f6c22c3020f664b9b7c0a4687266c (patch) | |
| tree | 14a3879a5c83261e2bcb3f7d1717dc10b65c619c /lang/gcc10 | |
| parent | aa7c6d92e71efad14e60dbb55c776ede39a24708 (diff) | |
| download | pkgsrc-289329332b9f6c22c3020f664b9b7c0a4687266c.tar.gz | |
gcc10: fix building for any zlib
Diffstat (limited to 'lang/gcc10')
| -rw-r--r-- | lang/gcc10/Makefile | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/lang/gcc10/Makefile b/lang/gcc10/Makefile index 1f0954b003e..1f6d7adae34 100644 --- a/lang/gcc10/Makefile +++ b/lang/gcc10/Makefile @@ -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" |