summaryrefslogtreecommitdiffstats
path: root/lib/Makefile
diff options
context:
space:
mode:
authorjb <jb@FreeBSD.org>1998-01-10 09:09:24 +0000
committerjb <jb@FreeBSD.org>1998-01-10 09:09:24 +0000
commit2bb704b6f7607d68ed237ae480089049a41dd3f1 (patch)
tree4cb7ce291fd890fd87208e5d7badb0956458900a /lib/Makefile
parentf9b84b42455f23d34173ca762ae95da95ddc0a0a (diff)
downloadFreeBSD-src-2bb704b6f7607d68ed237ae480089049a41dd3f1.zip
FreeBSD-src-2bb704b6f7607d68ed237ae480089049a41dd3f1.tar.gz
Bruce says that ${.CURDIR}/csu/${MACHINE} will prevent finding a
stale obj directory and we wouldn't want to do that! I trust he knows what he's talking about. 8-) Also avoid building libm at all until the NetBSD asm code is imported. I wrongly commented this out last time. Oops.
Diffstat (limited to 'lib/Makefile')
-rw-r--r--lib/Makefile8
1 files changed, 6 insertions, 2 deletions
diff --git a/lib/Makefile b/lib/Makefile
index 0900687..1b9a67a 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -4,10 +4,11 @@
SUBDIR=csu/tahoe.pcc
.elif ${MACHINE} == "vax"
SUBDIR=csu/vax.pcc
-.elif exists(csu/${MACHINE})
+.elif exists(${.CURDIR}/csu/${MACHINE})
SUBDIR=csu/${MACHINE}
.endif
+# Don't want to build libc on alpha just yet
.if ${MACHINE} != "alpha"
SUBDIR+=libc
.endif
@@ -42,11 +43,14 @@ SUBDIR+= libcrypt
SUBDIR+= libtelnet
.endif
-.if defined(WANT_CSRG_LIBM) && ${MACHINE} != "alpha"
+# Don't want to build libm on alpha just yet
+.if ${MACHINE} != "alpha"
+.if defined(WANT_CSRG_LIBM)
SUBDIR+= libm
.else
SUBDIR+= msun
.endif
+.endif
SUBDIR+= compat
OpenPOWER on IntegriCloud