summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrad Smith <brad@cvs.openbsd.org>2001-06-26 18:00:19 +0000
committerBrad Smith <brad@cvs.openbsd.org>2001-06-26 18:00:19 +0000
commit38ea74f0671aa2be04671bf321bd69147b1e4d2b (patch)
tree10b0307dae32f17dedacd0c3a7313a94a844829c
parent7368768e5871a149a92d80329a3c1d7458c0c742 (diff)
bye bye MIPS related bits and pieces.
-- Ok'd by deraadt@
-rw-r--r--Makefile14
-rw-r--r--etc/Makefile6
2 files changed, 3 insertions, 17 deletions
diff --git a/Makefile b/Makefile
index 59960adfccc..9024d9836ce 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.68 2001/06/26 15:33:28 hin Exp $
+# $OpenBSD: Makefile,v 1.69 2001/06/26 18:00:16 brad Exp $
#
# For more information on building in tricky environments, please see
@@ -95,9 +95,6 @@ build:
${MAKE} -f Makefile.bsd-wrapper depend && \
${MAKE} -f Makefile.bsd-wrapper perl.lib && \
exec ${SUDO} ${MAKE} -f Makefile.bsd-wrapper install.lib
-.if (${MACHINE_ARCH} == "mips")
- ldconfig -R
-.endif
${MAKE} depend && ${MAKE} && exec ${SUDO} ${MAKE} install
.if !defined(TARGET)
@@ -118,21 +115,14 @@ CROSSENV= AR=${CROSSDIR}/usr/bin/ar AS=${CROSSDIR}/usr/bin/as \
CROSSPATH= ${PATH}:${CROSSDIR}/usr/bin
cross-helpers:
- mkdir -p ${CROSSDIR}
+ @-mkdir -p ${CROSSDIR}
echo _MACHINE_ARCH | \
cat ${.CURDIR}/sys/arch/${TARGET}/include/param.h - | \
${CPP} -E -I${.CURDIR}/sys/arch | \
sed -n '$$p' >${CROSSDIR}/TARGET_ARCH
-# GROSS KLUDGE MACHINE_ARCH is mips, but we use mipsel for gnu tools.
-.if ${TARGET} == "arc" || ${TARGET} == "pmax"
- eval `grep '^osr=' sys/conf/newvers.sh`; \
- sed "s/\$$/el-unknown-openbsd$$osr/" ${CROSSDIR}/TARGET_ARCH > \
- ${CROSSDIR}/TARGET_CANON
-.else
eval `grep '^osr=' sys/conf/newvers.sh`; \
sed "s/\$$/-unknown-openbsd$$osr/" ${CROSSDIR}/TARGET_ARCH > \
${CROSSDIR}/TARGET_CANON
-.endif
cross-dirs: ${CROSSDIR}/stamp.dirs
@-mkdir -p ${CROSSDIR}
diff --git a/etc/Makefile b/etc/Makefile
index 101b9b8b4d4..6b2a2a6570c 100644
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.127 2001/06/26 16:52:39 kjell Exp $
+# $OpenBSD: Makefile,v 1.128 2001/06/26 18:00:18 brad Exp $
TZDIR= /usr/share/zoneinfo
LOCALTIME= US/Pacific
@@ -208,10 +208,6 @@ distribution-etc-root-var: distrib-dirs
${DESTDIR}/var/msgs/bounds
${INSTALL} -c -o ${BINOWN} -g utmp -m 664 /dev/null \
${DESTDIR}/var/run/utmp
-.if (${MACHINE_ARCH} == "mips")
- (cd etc.${MACHINE}; ${INSTALL} -c -o ${BINOWN} -g wheel -m 444 \
- ld.so.conf ${DESTDIR}/etc)
-.endif
.ifndef NOMAKEDEV
(cd ${DESTDIR}/dev; ./MAKEDEV all)
.endif