| @@ -1,14 +1,14 @@ | | | @@ -1,14 +1,14 @@ |
1 | # $NetBSD: bsd.own.mk.in,v 1.4 2012/03/05 07:26:37 sbd Exp $ | | 1 | # $NetBSD: bsd.own.mk.in,v 1.5 2015/02/14 04:46:50 riastradh Exp $ |
2 | | | 2 | |
3 | .if !defined(_BSD_OWN_MK_) | | 3 | .if !defined(_BSD_OWN_MK_) |
4 | _BSD_OWN_MK_=1 | | 4 | _BSD_OWN_MK_=1 |
5 | | | 5 | |
6 | .if defined(MAKECONF) && exists(${MAKECONF}) | | 6 | .if defined(MAKECONF) && exists(${MAKECONF}) |
7 | .include "${MAKECONF}" | | 7 | .include "${MAKECONF}" |
8 | .elif exists(@SYSCONFDIR@/mk.conf) | | 8 | .elif exists(@SYSCONFDIR@/mk.conf) |
9 | .include "@SYSCONFDIR@/mk.conf" | | 9 | .include "@SYSCONFDIR@/mk.conf" |
10 | .elif exists(/etc/mk.conf) | | 10 | .elif exists(/etc/mk.conf) |
11 | .include "/etc/mk.conf" | | 11 | .include "/etc/mk.conf" |
12 | .endif | | 12 | .endif |
13 | | | 13 | |
14 | # Defining `SKEY' causes support for S/key authentication to be compiled in. | | 14 | # Defining `SKEY' causes support for S/key authentication to be compiled in. |
| @@ -108,26 +108,27 @@ NOPIC?=1 | | | @@ -108,26 +108,27 @@ NOPIC?=1 |
108 | # for different platforms and object formats. | | 108 | # for different platforms and object formats. |
109 | # OBJECT_FMT: currently either "ELF" or "a.out". | | 109 | # OBJECT_FMT: currently either "ELF" or "a.out". |
110 | # SHLIB_TYPE: "ELF" or "a.out" or "" to force static libraries. | | 110 | # SHLIB_TYPE: "ELF" or "a.out" or "" to force static libraries. |
111 | # | | 111 | # |
112 | .if ${MACHINE_ARCH} == "alpha" || \ | | 112 | .if ${MACHINE_ARCH} == "alpha" || \ |
113 | ${MACHINE_ARCH} == "mipsel" || ${MACHINE_ARCH} == "mipseb" || \ | | 113 | ${MACHINE_ARCH} == "mipsel" || ${MACHINE_ARCH} == "mipseb" || \ |
114 | ${MACHINE_ARCH} == "powerpc" || \ | | 114 | ${MACHINE_ARCH} == "powerpc" || \ |
115 | ${MACHINE_ARCH} == "sparc" || \ | | 115 | ${MACHINE_ARCH} == "sparc" || \ |
116 | ${MACHINE_ARCH} == "sparc64" || \ | | 116 | ${MACHINE_ARCH} == "sparc64" || \ |
117 | ${MACHINE_ARCH} == "x86_64" || \ | | 117 | ${MACHINE_ARCH} == "x86_64" || \ |
118 | ${MACHINE_ARCH} == "i386" || \ | | 118 | ${MACHINE_ARCH} == "i386" || \ |
119 | ${MACHINE_ARCH} == "m68000" || \ | | 119 | ${MACHINE_ARCH} == "m68000" || \ |
120 | ${MACHINE_ARCH} == "arm" || \ | | 120 | ${MACHINE_ARCH} == "arm" || \ |
| | | 121 | !empty(MACHINE_ARCH:Mearm*) || \ |
121 | ${MACHINE} == "next68k" || \ | | 122 | ${MACHINE} == "next68k" || \ |
122 | ${MACHINE} == "sun3" || \ | | 123 | ${MACHINE} == "sun3" || \ |
123 | ${MACHINE} == "mvme68k" || \ | | 124 | ${MACHINE} == "mvme68k" || \ |
124 | ${MACHINE} == "hp300" || \ | | 125 | ${MACHINE} == "hp300" || \ |
125 | ${MACHINE} == "news68k" || \ | | 126 | ${MACHINE} == "news68k" || \ |
126 | ${MACHINE} == "arm26" | | 127 | ${MACHINE} == "arm26" |
127 | OBJECT_FMT?=ELF | | 128 | OBJECT_FMT?=ELF |
128 | .else | | 129 | .else |
129 | OBJECT_FMT?=a.out | | 130 | OBJECT_FMT?=a.out |
130 | .endif | | 131 | .endif |
131 | | | 132 | |
132 | # Location of the file that contains the major and minor numbers of the | | 133 | # Location of the file that contains the major and minor numbers of the |
133 | # version of a shared library. If this file exists a shared library | | 134 | # version of a shared library. If this file exists a shared library |