From owner-svn-src-stable-10@FreeBSD.ORG  Thu Oct 31 17:56:27 2013
Return-Path: <owner-svn-src-stable-10@FreeBSD.ORG>
Delivered-To: svn-src-stable-10@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 BE0FF69C;
 Thu, 31 Oct 2013 17:56:27 +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 AB35923FF;
 Thu, 31 Oct 2013 17:56:27 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9VHuRvW093774;
 Thu, 31 Oct 2013 17:56:27 GMT (envelope-from brooks@svn.freebsd.org)
Received: (from brooks@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9VHuRbV093773;
 Thu, 31 Oct 2013 17:56:27 GMT (envelope-from brooks@svn.freebsd.org)
Message-Id: <201310311756.r9VHuRbV093773@svn.freebsd.org>
From: Brooks Davis <brooks@FreeBSD.org>
Date: Thu, 31 Oct 2013 17:56:27 +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: r257459 - 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-10@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for only the 10-stable src tree
 <svn-src-stable-10.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable-10>, 
 <mailto:svn-src-stable-10-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-10>
List-Post: <mailto:svn-src-stable-10@freebsd.org>
List-Help: <mailto:svn-src-stable-10-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10>, 
 <mailto:svn-src-stable-10-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 31 Oct 2013 17:56:27 -0000

Author: brooks
Date: Thu Oct 31 17:56:27 2013
New Revision: 257459
URL: http://svnweb.freebsd.org/changeset/base/257459

Log:
  MFC r257268:
  
  Enable the --sysroot=/foo option in ld by always building with a sysroot
  defined. When not building as a cross linker, the sysroot is set to "/".
  
  Exp-run by:	bdrewery (ports/183206)
  Approved by:	re (gjb)

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	Thu Oct 31 17:33:29 2013	(r257458)
+++ stable/10/gnu/usr.bin/binutils/ld/Makefile	Thu Oct 31 17:56:27 2013	(r257459)
@@ -31,7 +31,7 @@ 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}\"
+CFLAGS+= -DBINDIR=\"${BINDIR}\" -DTARGET_SYSTEM_ROOT=\"${TOOLS_PREFIX:U/}\"
 CFLAGS+= -DTOOLBINDIR=\"${TOOLS_PREFIX}/${BINDIR}/libexec\"
 CFLAGS+= -D_GNU_SOURCE
 CFLAGS+= -I${SRCDIR}/ld -I${SRCDIR}/bfd