| @@ -1,14 +1,14 @@ | | | @@ -1,14 +1,14 @@ |
1 | # $NetBSD: bsd.own.mk,v 1.1019 2017/10/08 15:20:32 christos Exp $ | | 1 | # $NetBSD: bsd.own.mk,v 1.1020 2017/11/28 18:14:37 christos 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 | # |
| @@ -123,29 +123,29 @@ HAVE_LIBGCC_EH?= yes | | | @@ -123,29 +123,29 @@ HAVE_LIBGCC_EH?= yes |
123 | HAVE_SSP?= no | | 123 | HAVE_SSP?= no |
124 | .else | | 124 | .else |
125 | HAVE_SSP?= yes | | 125 | HAVE_SSP?= yes |
126 | .if !defined(NOFORT) && ${USE_FORT:Uno} != "no" | | 126 | .if !defined(NOFORT) && ${USE_FORT:Uno} != "no" |
127 | USE_SSP?= yes | | 127 | USE_SSP?= yes |
128 | .endif | | 128 | .endif |
129 | .endif | | 129 | .endif |
130 | | | 130 | |
131 | # | | 131 | # |
132 | # What GDB is used? | | 132 | # What GDB is used? |
133 | # | | 133 | # |
134 | HAVE_GDB?= 712 | | 134 | HAVE_GDB?= 712 |
135 | | | 135 | |
136 | .if ${HAVE_GDB} == 712 | | 136 | .if ${HAVE_GDB} == 801 |
137 | EXTERNAL_GDB_SUBDIR= gdb | | 137 | EXTERNAL_GDB_SUBDIR= gdb |
138 | .elif ${HAVE_GDB} == 710 | | 138 | .elif ${HAVE_GDB} == 712 |
139 | EXTERNAL_GDB_SUBDIR= gdb.old | | 139 | EXTERNAL_GDB_SUBDIR= gdb.old |
140 | .else | | 140 | .else |
141 | EXTERNAL_GDB_SUBDIR= /does/not/exist | | 141 | EXTERNAL_GDB_SUBDIR= /does/not/exist |
142 | .endif | | 142 | .endif |
143 | | | 143 | |
144 | # | | 144 | # |
145 | # What binutils is used? | | 145 | # What binutils is used? |
146 | # | | 146 | # |
147 | HAVE_BINUTILS?= 227 | | 147 | HAVE_BINUTILS?= 227 |
148 | | | 148 | |
149 | .if ${HAVE_BINUTILS} == 227 | | 149 | .if ${HAVE_BINUTILS} == 227 |
150 | EXTERNAL_BINUTILS_SUBDIR= binutils | | 150 | EXTERNAL_BINUTILS_SUBDIR= binutils |
151 | .else | | 151 | .else |