svn commit: r257662 - stable/10/gnu/usr.bin/binutils/ld
Brooks Davis
brooks at FreeBSD.org
Mon Nov 4 23:36:50 UTC 2013
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
More information about the svn-src-stable-10
mailing list