CVS commit: pkgsrc/lang

["Tobias Nygren" <tnn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tnn
Date:           Sat Jun 26 17:42:23 UTC 2021

Modified Files:
        pkgsrc/lang/gcc10: Makefile
        pkgsrc/lang/gcc6: Makefile
        pkgsrc/lang/gcc7: Makefile
        pkgsrc/lang/gcc8: Makefile
        pkgsrc/lang/gcc9: Makefile

Log Message:
gcc*: disable full bootstrap when the pkgsrc compiler is clang

LLVM versions >= 12 cannot currently correctly compile gcc stage 1 because
GCC assumes references to certain symbols like "ix86_isa_flags" will be
optimized away.
Details: https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=255760


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 pkgsrc/lang/gcc10/Makefile
cvs rdiff -u -r1.31 -r1.32 pkgsrc/lang/gcc6/Makefile
cvs rdiff -u -r1.39 -r1.40 pkgsrc/lang/gcc7/Makefile
cvs rdiff -u -r1.27 -r1.28 pkgsrc/lang/gcc8/Makefile
cvs rdiff -u -r1.31 -r1.32 pkgsrc/lang/gcc9/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.11 pkgsrc/lang/gcc10/Makefile:1.12
--- pkgsrc/lang/gcc10/Makefile:1.11     Mon May 24 19:52:30 2021
+++ pkgsrc/lang/gcc10/Makefile  Sat Jun 26 17:42:23 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2021/05/24 19:52:30 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2021/06/26 17:42:23 tnn Exp $
 
 GCC_PKGNAME=           gcc10
 PKGREVISION=           1
@@ -121,6 +121,9 @@ MAKE_ENV.NetBSD+=   ac_cv_func_uselocale=n
 MAKE_ENV.SunOS+=       ac_cv_func_mkostemp=no
 
 CONFIGURE_ARGS.DragonFly+=     --disable-bootstrap
+.if !empty(PKGSRC_COMPILER:Mclang)
+CONFIGURE_ARGS+=       --disable-bootstrap
+.endif
 
 .if !empty(MACHINE_PLATFORM:MNetBSD-*-i386) || !empty(MACHINE_PLATFORM:MLinux-*-i386)
 CONFIGURE_ARGS+=       --with-arch=i486 --with-tune=i486

Index: pkgsrc/lang/gcc6/Makefile
diff -u pkgsrc/lang/gcc6/Makefile:1.31 pkgsrc/lang/gcc6/Makefile:1.32
--- pkgsrc/lang/gcc6/Makefile:1.31      Mon May 24 19:52:31 2021
+++ pkgsrc/lang/gcc6/Makefile   Sat Jun 26 17:42:23 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2021/05/24 19:52:31 wiz Exp $
+# $NetBSD: Makefile,v 1.32 2021/06/26 17:42:23 tnn Exp $
 
 GCC_PKGNAME=           gcc6
 .include               "version.mk"
@@ -130,6 +130,9 @@ MAKE_ENV.NetBSD+=   ac_cv_func_uselocale=n
 MAKE_ENV.SunOS+=       ac_cv_func_mkostemp=no
 
 CONFIGURE_ARGS.DragonFly+=     --disable-bootstrap
+.if !empty(PKGSRC_COMPILER:Mclang)
+CONFIGURE_ARGS+=               --disable-bootstrap
+.endif
 
 .if !empty(MACHINE_PLATFORM:MNetBSD-*-i386) || !empty(MACHINE_PLATFORM:MLinux-*-i386)
 CONFIGURE_ARGS+=       --with-arch=i486 --with-tune=i486

Index: pkgsrc/lang/gcc7/Makefile
diff -u pkgsrc/lang/gcc7/Makefile:1.39 pkgsrc/lang/gcc7/Makefile:1.40
--- pkgsrc/lang/gcc7/Makefile:1.39      Mon May 24 19:52:31 2021
+++ pkgsrc/lang/gcc7/Makefile   Sat Jun 26 17:42:23 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2021/05/24 19:52:31 wiz Exp $
+# $NetBSD: Makefile,v 1.40 2021/06/26 17:42:23 tnn Exp $
 
 GCC_PKGNAME=           gcc7
 .include               "version.mk"
@@ -120,6 +120,9 @@ MAKE_ENV.NetBSD+=   ac_cv_func_uselocale=n
 MAKE_ENV.SunOS+=       ac_cv_func_mkostemp=no
 
 CONFIGURE_ARGS.DragonFly+=     --disable-bootstrap
+.if !empty(PKGSRC_COMPILER:Mclang)
+CONFIGURE_ARGS+=               --disable-bootstrap
+.endif
 
 .if !empty(MACHINE_PLATFORM:MNetBSD-*-i386) || !empty(MACHINE_PLATFORM:MLinux-*-i386)
 CONFIGURE_ARGS+=       --with-arch=i486 --with-tune=i486

Index: pkgsrc/lang/gcc8/Makefile
diff -u pkgsrc/lang/gcc8/Makefile:1.27 pkgsrc/lang/gcc8/Makefile:1.28
--- pkgsrc/lang/gcc8/Makefile:1.27      Mon May 24 19:52:31 2021
+++ pkgsrc/lang/gcc8/Makefile   Sat Jun 26 17:42:23 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2021/05/24 19:52:31 wiz Exp $
+# $NetBSD: Makefile,v 1.28 2021/06/26 17:42:23 tnn Exp $
 
 GCC_PKGNAME=           gcc8
 .include               "version.mk"
@@ -125,6 +125,9 @@ MAKE_ENV.NetBSD+=   ac_cv_func_uselocale=n
 MAKE_ENV.SunOS+=       ac_cv_func_mkostemp=no
 
 CONFIGURE_ARGS.DragonFly+=     --disable-bootstrap
+.if !empty(PKGSRC_COMPILER:Mclang)
+CONFIGURE_ARGS+=               --disable-bootstrap
+.endif
 
 .if !empty(MACHINE_PLATFORM:MNetBSD-*-i386) || !empty(MACHINE_PLATFORM:MLinux-*-i386)
 CONFIGURE_ARGS+=       --with-arch=i486 --with-tune=i486

Index: pkgsrc/lang/gcc9/Makefile
diff -u pkgsrc/lang/gcc9/Makefile:1.31 pkgsrc/lang/gcc9/Makefile:1.32
--- pkgsrc/lang/gcc9/Makefile:1.31      Mon May 24 19:52:31 2021
+++ pkgsrc/lang/gcc9/Makefile   Sat Jun 26 17:42:23 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2021/05/24 19:52:31 wiz Exp $
+# $NetBSD: Makefile,v 1.32 2021/06/26 17:42:23 tnn Exp $
 
 GCC_PKGNAME=   gcc9
 .include "version.mk"
@@ -126,6 +126,9 @@ MAKE_ENV+=          ac_cv_func_uselocale=no
 MAKE_ENV.SunOS+=       ac_cv_func_mkostemp=no
 
 CONFIGURE_ARGS.DragonFly+=     --disable-bootstrap
+.if !empty(PKGSRC_COMPILER:Mclang)
+CONFIGURE_ARGS+=               --disable-bootstrap
+.endif
 
 .if ${MACHINE_PLATFORM:MNetBSD-*-i386} || ${MACHINE_PLATFORM:MLinux-*-i386}
 CONFIGURE_ARGS+=       --with-arch=i486 --with-tune=i486