diff options
| -rw-r--r-- | share/mk/bsd.lib.mk | 7 | ||||
| -rw-r--r-- | share/mk/bsd.own.mk | 16 |
2 files changed, 15 insertions, 8 deletions
diff --git a/share/mk/bsd.lib.mk b/share/mk/bsd.lib.mk index ddbd094e0a7..2911b2134d5 100644 --- a/share/mk/bsd.lib.mk +++ b/share/mk/bsd.lib.mk @@ -1,4 +1,4 @@ -# $OpenBSD: bsd.lib.mk,v 1.36 2001/09/25 14:33:44 drahn Exp $ +# $OpenBSD: bsd.lib.mk,v 1.37 2004/02/01 06:02:13 drahn Exp $ # $NetBSD: bsd.lib.mk,v 1.67 1996/01/17 20:39:26 mycroft Exp $ # @(#)bsd.lib.mk 5.26 (Berkeley) 5/2/91 @@ -74,10 +74,15 @@ SHLIB_MINOR=${minor} @rm -f ${.TARGET}.o .S.o .s.o: +.if (${MACHINE_ARCH} == "arm") + @echo ${COMPILE.S:Q} ${CFLAGS:M-[ID]*} ${AINC} ${.IMPSRC} + @${COMPILE.S} ${CFLAGS:M-[ID]*} ${AINC} ${.IMPSRC} -o ${.TARGET}.o +.else @echo "${CPP} ${CPPFLAGS} ${CFLAGS:M-[ID]*} ${AINC} ${.IMPSRC} | \ ${AS} -o ${.TARGET}" @${CPP} ${CPPFLAGS} ${CFLAGS:M-[ID]*} ${AINC} ${.IMPSRC} | \ ${AS} -o ${.TARGET}.o +.endif @${LD} -x -r ${.TARGET}.o -o ${.TARGET} @rm -f ${.TARGET}.o diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk index 497cc92f434..b82f915db7f 100644 --- a/share/mk/bsd.own.mk +++ b/share/mk/bsd.own.mk @@ -1,4 +1,4 @@ -# $OpenBSD: bsd.own.mk,v 1.72 2004/01/28 02:28:14 mickey Exp $ +# $OpenBSD: bsd.own.mk,v 1.73 2004/02/01 06:02:13 drahn Exp $ # $NetBSD: bsd.own.mk,v 1.24 1996/04/13 02:08:09 thorpej Exp $ # Host-specific overrides @@ -28,17 +28,18 @@ AFS?= yes # Set `DEBUGLIBS' to `yes' to build libraries with debugging symbols DEBUGLIBS?= no # Set toolchain to be able to know differences. -.if (${MACHINE_ARCH} == "alpha" || ${MACHINE_ARCH} == "powerpc" || \ - ${MACHINE_ARCH} == "hppa" || ${MACHINE_ARCH} == "sparc64" || \ - ${MACHINE_ARCH} == "sparc" || ${MACHINE_ARCH} == "i386" || \ - ${MACHINE_ARCH} == "x86_64") +.if ( ${MACHINE_ARCH} == "alpha" || ${MACHINE_ARCH} == "arm" || \ + ${MACHINE_ARCH} == "hppa" || ${MACHINE_ARCH} == "i386" || \ + ${MACHINE_ARCH} == "powerpc" || ${MACHINE_ARCH} == "sparc" || \ + ${MACHINE_ARCH} == "sparc64" || ${MACHINE_ARCH} == "x86_64") ELF_TOOLCHAIN?= yes .else ELF_TOOLCHAIN?= no .endif # do the dew -.if (${MACHINE_ARCH} == "x86_64" || ${MACHINE_ARCH} == "hppa64") +.if (${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "hppa64" || \ + ${MACHINE_ARCH} == "x86_64") USE_GCC3?=yes .else USE_GCC3?=no @@ -117,7 +118,8 @@ STATIC?= -static # don't try to generate PIC versions of libraries on machines # which don't support PIC. .if (${MACHINE_ARCH} == "vax") || (${MACHINE_ARCH} == "x86_64") || \ - (${MACHINE_ARCH} == "hppa") || (${MACHINE_ARCH} == "m88k") + (${MACHINE_ARCH} == "hppa") || (${MACHINE_ARCH} == "m88k") \ + || (${MACHINE_ARCH} == "arm") NOPIC= .endif |