From 8eb2cccfad35e8f1a2847cc044fd49971bb1577e Mon Sep 17 00:00:00 2001
From: imp <imp@FreeBSD.org>
Date: Tue, 22 Feb 2011 04:49:57 +0000
Subject: Back out 218933 and 281934.  The easy cases still worked, but some
 hard cases broke in worse ways than the status quo.  Back them out until that
 can be resolved.

---
 share/mk/bsd.own.mk | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

(limited to 'share')

diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk
index c23a004..5c62ae5 100644
--- a/share/mk/bsd.own.mk
+++ b/share/mk/bsd.own.mk
@@ -282,6 +282,18 @@ WITH_IDEA=
 .endif
 
 #
+# Default behaviour of MK_CLANG depends on the architecture.
+#
+.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386" || \
+    ${MACHINE_ARCH} == "powerpc"
+_clang_yes=CLANG
+_clang_no=
+.else
+_clang_yes=
+_clang_no=CLANG
+.endif
+
+#
 # MK_* options which default to "yes".
 #
 .for var in \
@@ -301,6 +313,7 @@ WITH_IDEA=
     BIND_MTREE \
     BIND_NAMED \
     BIND_UTILS \
+    BINUTILS \
     BLUETOOTH \
     BOOT \
     BSD_CPIO \
@@ -308,7 +321,7 @@ WITH_IDEA=
     BZIP2 \
     CALENDAR \
     CDDL \
-    CLANG \
+    ${_clang_yes} \
     CPP \
     CRYPT \
     CTM \
@@ -323,6 +336,7 @@ WITH_IDEA=
     FP_LIBC \
     FREEBSD_UPDATE \
     GAMES \
+    GCC \
     GCOV \
     GDB \
     GNU \
@@ -412,6 +426,7 @@ MK_${var}:=	yes
     BIND_SIGCHASE \
     BIND_XML \
     BSD_GREP \
+    ${_clang_no} \
     GPIO \
     HESIOD \
     IDEA
-- 
cgit v1.1