From owner-svn-src-stable@FreeBSD.ORG  Mon Nov  4 23:36:50 2013
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 24BEE6EA;
 Mon,  4 Nov 2013 23:36:50 +0000 (UTC)
 (envelope-from brooks@FreeBSD.org)
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))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 0FF102BDA;
 Mon,  4 Nov 2013 23:36:50 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rA4NancI091204;
 Mon, 4 Nov 2013 23:36:49 GMT (envelope-from brooks@svn.freebsd.org)
Received: (from brooks@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id rA4Nan8W091203;
 Mon, 4 Nov 2013 23:36:49 GMT (envelope-from brooks@svn.freebsd.org)
Message-Id: <201311042336.rA4Nan8W091203@svn.freebsd.org>
From: Brooks Davis <brooks@FreeBSD.org>
Date: Mon, 4 Nov 2013 23:36:49 +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: r257662 - stable/10/gnu/usr.bin/binutils/ld
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 04 Nov 2013 23:36:50 -0000

Author: brooks
Date: Mon Nov  4 23:36:49 2013
New Revision: 257662
URL: http://svnweb.freebsd.org/changeset/base/257662

Log:
  MFC r257530
  
  Reimplement r257525 such that it work with the historic FreeBSD make
  implementation.  This fixes the toolchain and kernel-toolchain targets
  when building from older FreeBSD versions where make is fmake.
  
  Sponsored by:	DARPA/AFRL
  Approved by:	re (glebius)

Modified:
  stable/10/gnu/usr.bin/binutils/ld/Makefile
Directory Properties:
  stable/10/gnu/usr.bin/binutils/   (props changed)

Modified: stable/10/gnu/usr.bin/binutils/ld/Makefile
==============================================================================
--- stable/10/gnu/usr.bin/binutils/ld/Makefile	Mon Nov  4 23:25:07 2013	(r257661)
+++ stable/10/gnu/usr.bin/binutils/ld/Makefile	Mon Nov  4 23:36:49 2013	(r257662)
@@ -31,7 +31,12 @@ CFLAGS+= -DTARGET=\"${TARGET_TUPLE}\"
 CFLAGS+= -DDEFAULT_EMULATION=\"${NATIVE_EMULATION}\"
 CFLAGS+= -DSCRIPTDIR=\"${TOOLS_PREFIX}/usr/libdata\"
 CFLAGS+= -DBFD_VERSION_STRING=\"${VERSION}\"
-CFLAGS+= -DBINDIR=\"${BINDIR}\" -DTARGET_SYSTEM_ROOT=\"${TOOLS_PREFIX:U/}\"
+CFLAGS+= -DBINDIR=\"${BINDIR}\"
+.if defined(TOOLS_PREFIX)
+CFLAGS+= -DTARGET_SYSTEM_ROOT=\"${TOOLS_PREFIX}\"
+.else
+CFLAGS+= -DTARGET_SYSTEM_ROOT=\"/\"
+.endif
 CFLAGS+= -DTOOLBINDIR=\"${TOOLS_PREFIX}/${BINDIR}/libexec\"
 CFLAGS+= -D_GNU_SOURCE
 CFLAGS+= -I${SRCDIR}/ld -I${SRCDIR}/bfd