| @@ -1,14 +1,14 @@ | | | @@ -1,14 +1,14 @@ |
1 | # $NetBSD: bsd.own.mk,v 1.912 2016/03/26 10:38:22 mrg Exp $ | | 1 | # $NetBSD: bsd.own.mk,v 1.913 2016/03/27 10:46:41 skrll 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,27 +53,30 @@ TOOLCHAIN_MISSING?= no | | | @@ -53,27 +53,30 @@ TOOLCHAIN_MISSING?= no |
53 | .if ${MACHINE_CPU} == "aarch64" && !defined(EXTERNAL_TOOLCHAIN) && ${MKLLVM:Uyes} != "no" | | 53 | .if ${MACHINE_CPU} == "aarch64" && !defined(EXTERNAL_TOOLCHAIN) && ${MKLLVM:Uyes} != "no" |
54 | MKLLVM?= yes | | 54 | MKLLVM?= yes |
55 | HAVE_LLVM?= yes | | 55 | HAVE_LLVM?= yes |
56 | MKGCC?= no | | 56 | MKGCC?= no |
57 | .endif | | 57 | .endif |
58 | | | 58 | |
59 | # | | 59 | # |
60 | # GCC Using platforms. | | 60 | # GCC Using platforms. |
61 | # | | 61 | # |
62 | .if ${MKGCC:Uyes} != "no" | | 62 | .if ${MKGCC:Uyes} != "no" |
63 | | | 63 | |
64 | .if ${MACHINE_CPU} == "aarch64" | | 64 | .if ${MACHINE_CPU} == "aarch64" |
65 | HAVE_GCC?= 0 | | 65 | HAVE_GCC?= 0 |
66 | .elif ${MACHINE_ARCH} == "vax" || ${MACHINE} == "playstation2" | | 66 | .elif \ |
| | | 67 | ${MACHINE_ARCH} == "hppa" || \ |
| | | 68 | ${MACHINE} == "playstation2" || \ |
| | | 69 | ${MACHINE_ARCH} == "vax" |
67 | HAVE_GCC?= 53 | | 70 | HAVE_GCC?= 53 |
68 | .else | | 71 | .else |
69 | # Otherwise, default to GCC4.8 | | 72 | # Otherwise, default to GCC4.8 |
70 | HAVE_GCC?= 48 | | 73 | HAVE_GCC?= 48 |
71 | .endif | | 74 | .endif |
72 | | | 75 | |
73 | # | | 76 | # |
74 | # Platforms that can't run a modern GCC natively | | 77 | # Platforms that can't run a modern GCC natively |
75 | .if ${MACHINE_ARCH} == "m68000" | | 78 | .if ${MACHINE_ARCH} == "m68000" |
76 | MKGCCCMDS?= no | | 79 | MKGCCCMDS?= no |
77 | .endif | | 80 | .endif |
78 | | | 81 | |
79 | # | | 82 | # |