svn commit: r209509 - head

[Warner Losh]

Author: imp
Date: Thu Jun 24 16:28:52 2010
New Revision: 209509
URL: http://svn.freebsd.org/changeset/base/209509

Log:
  Merge from TBEMD:
  
  Rather than having arch specific code in Makefile.inc1, generalize so
  that we can control the settings of different options on a per
  architecutre basis.
  
  Reviewed by:	arch@ (twice)

Added:
  head/Makefile.mips   (contents, props changed)
Modified:
  head/Makefile.inc1

Modified: head/Makefile.inc1
==============================================================================
--- head/Makefile.inc1	Thu Jun 24 15:49:33 2010	(r209508)
+++ head/Makefile.inc1	Thu Jun 24 16:28:52 2010	(r209509)
@@ -30,9 +30,7 @@
 
 .include <bsd.own.mk>
 
-.if ${MACHINE_ARCH} == "mips"
-MK_RESCUE=no	# not yet
-.endif
+.include <bsd.arch.inc.mk>
 
 # We must do share/info early so that installation of info `dir'
 # entries works correctly.  Do it first since it is less likely to

Added: head/Makefile.mips
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/Makefile.mips	Thu Jun 24 16:28:52 2010	(r209509)
@@ -0,0 +1,5 @@
+# $FreeBSD$
+
+# A bug in binutils prevents rescue from building, so override the user's
+# choice.
+MK_RESCUE=no