From owner-svn-src-all@FreeBSD.ORG  Mon Feb  9 10:46:40 2015
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.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 0670CFF;
 Mon,  9 Feb 2015 10:46:40 +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 E66E4D9E;
 Mon,  9 Feb 2015 10:46:39 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t19AkdcL067272;
 Mon, 9 Feb 2015 10:46:39 GMT (envelope-from gjb@FreeBSD.org)
Received: (from gjb@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t19AkdCM067270;
 Mon, 9 Feb 2015 10:46:39 GMT (envelope-from gjb@FreeBSD.org)
Message-Id: <201502091046.t19AkdCM067270@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org
 using -f
From: Glen Barber <gjb@FreeBSD.org>
Date: Mon, 9 Feb 2015 10:46:39 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r278450 - head/release
X-SVN-Group: head
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, 09 Feb 2015 10:46:40 -0000

Author: gjb
Date: Mon Feb  9 10:46:39 2015
New Revision: 278450
URL: https://svnweb.freebsd.org/changeset/base/278450

Log:
  Revert r278445.
  
  I was going to use __FreeBSD_version to determine if
  xz(1) should be multi-threaded by default, but doing
  this will cause problems if/when the changes are merged
  from head.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  head/release/Makefile

Modified: head/release/Makefile
==============================================================================
--- head/release/Makefile	Mon Feb  9 10:42:27 2015	(r278449)
+++ head/release/Makefile	Mon Feb  9 10:46:39 2015	(r278450)
@@ -59,10 +59,6 @@ TARGET_ARCH=	${TARGET}
 IMAKE=		${MAKE} TARGET_ARCH=${TARGET_ARCH} TARGET=${TARGET}
 DISTDIR=	dist
 
-# Get the __FreeBSD_version for the build
-FREEBSD_VERSION!=	awk '/^\#define __FreeBSD_version/ {print $$3}' \
-	${.CURDIR}/../sys/sys/param.h
-
 .if !defined(NO_XZTHREADS) && empty(XZ_THREADS)
 XZ_THREADS=	0
 .else