From owner-svn-src-all@FreeBSD.ORG  Mon Aug 25 17:31:07 2014
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 53A48A46;
 Mon, 25 Aug 2014 17:31:07 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 3F0A43581;
 Mon, 25 Aug 2014 17:31:07 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7PHV7iJ024236;
 Mon, 25 Aug 2014 17:31:07 GMT (envelope-from ian@FreeBSD.org)
Received: (from ian@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7PHV7K2024235;
 Mon, 25 Aug 2014 17:31:07 GMT (envelope-from ian@FreeBSD.org)
Message-Id: <201408251731.s7PHV7K2024235@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: ian set sender to ian@FreeBSD.org
 using -f
From: Ian Lepore <ian@FreeBSD.org>
Date: Mon, 25 Aug 2014 17:31:07 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r270600 - stable/10
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 25 Aug 2014 17:31:07 -0000

Author: ian
Date: Mon Aug 25 17:31:06 2014
New Revision: 270600
URL: http://svnweb.freebsd.org/changeset/base/270600

Log:
  Revert r270079 which was MFC of r269688, build libohash while bootstrapping.
  
  The changes to split the ohash code out of m4 into its own library haven't
  been MFC'd, so this change was causing an error during bootstrap when
  building stable-10.
  
  Submitted by:	Dai Sieh <dsieh@dsieh.com>
  Pointy hat to:	ian

Modified:
  stable/10/Makefile.inc1

Modified: stable/10/Makefile.inc1
==============================================================================
--- stable/10/Makefile.inc1	Mon Aug 25 17:30:33 2014	(r270599)
+++ stable/10/Makefile.inc1	Mon Aug 25 17:31:06 2014	(r270600)
@@ -1228,8 +1228,7 @@ _sed=		usr.bin/sed
 .endif
 
 .if ${BOOTSTRAPPING} < 1000002
-_m4=		lib/libohash \
-		usr.bin/m4
+_m4=		usr.bin/m4
 .endif
 
 .if ${BOOTSTRAPPING} < 1000013