| @@ -1,14 +1,14 @@ | | | @@ -1,14 +1,14 @@ |
| 1 | # $NetBSD: bsd.own.mk,v 1.1223 2020/10/09 04:19:43 macallan Exp $ | | 1 | # $NetBSD: bsd.own.mk,v 1.1224 2020/10/09 05:41:16 mrg Exp $ |
| 2 | | | 2 | |
| 3 | # This needs to be before bsd.init.mk | | 3 | # This needs to be before bsd.init.mk |
| 4 | .if defined(BSD_MK_COMPAT_FILE) | | 4 | .if defined(BSD_MK_COMPAT_FILE) |
| 5 | .include <${BSD_MK_COMPAT_FILE}> | | 5 | .include <${BSD_MK_COMPAT_FILE}> |
| 6 | .endif | | 6 | .endif |
| 7 | | | 7 | |
| 8 | .if !defined(_BSD_OWN_MK_) | | 8 | .if !defined(_BSD_OWN_MK_) |
| 9 | _BSD_OWN_MK_=1 | | 9 | _BSD_OWN_MK_=1 |
| 10 | | | 10 | |
| 11 | MAKECONF?= /etc/mk.conf | | 11 | MAKECONF?= /etc/mk.conf |
| 12 | .-include "${MAKECONF}" | | 12 | .-include "${MAKECONF}" |
| 13 | | | 13 | |
| 14 | # | | 14 | # |
| @@ -53,30 +53,26 @@ NEED_OWN_INSTALL_TARGET?= yes | | | @@ -53,30 +53,26 @@ NEED_OWN_INSTALL_TARGET?= yes |
| 53 | # TOOLCHAIN_MISSING?= yes | | 53 | # TOOLCHAIN_MISSING?= yes |
| 54 | # .endif | | 54 | # .endif |
| 55 | | | 55 | |
| 56 | TOOLCHAIN_MISSING?= no | | 56 | TOOLCHAIN_MISSING?= no |
| 57 | | | 57 | |
| 58 | # | | 58 | # |
| 59 | # GCC Using platforms. | | 59 | # GCC Using platforms. |
| 60 | # | | 60 | # |
| 61 | .if ${MKGCC:Uyes} != "no" | | 61 | .if ${MKGCC:Uyes} != "no" |
| 62 | | | 62 | |
| 63 | # | | 63 | # |
| 64 | # What GCC is used? | | 64 | # What GCC is used? |
| 65 | # | | 65 | # |
| 66 | .if ${MACHINE_CPU} == "powerpc" || ${MACHINE_CPU} == "sh3" || \ | | | |
| 67 | ${MACHINE_CPU} == "m68k" || ${MACHINE} == "vax" | | | |
| 68 | HAVE_GCC?= 8 | | | |
| 69 | .endif | | | |
| 70 | HAVE_GCC?= 9 | | 66 | HAVE_GCC?= 9 |
| 71 | | | 67 | |
| 72 | # | | 68 | # |
| 73 | # Platforms that can't run a modern GCC natively | | 69 | # Platforms that can't run a modern GCC natively |
| 74 | .if ${MACHINE_ARCH} == "m68000" | | 70 | .if ${MACHINE_ARCH} == "m68000" |
| 75 | MKGCCCMDS?= no | | 71 | MKGCCCMDS?= no |
| 76 | .endif | | 72 | .endif |
| 77 | | | 73 | |
| 78 | # | | 74 | # |
| 79 | # We import the old gcc as "gcc.old" when upgrading. EXTERNAL_GCC_SUBDIR is | | 75 | # We import the old gcc as "gcc.old" when upgrading. EXTERNAL_GCC_SUBDIR is |
| 80 | # set to the relevant subdirectory in src/external/gpl3 for his HAVE_GCC. | | 76 | # set to the relevant subdirectory in src/external/gpl3 for his HAVE_GCC. |
| 81 | # | | 77 | # |
| 82 | .if ${HAVE_GCC} == 8 | | 78 | .if ${HAVE_GCC} == 8 |