svn commit: r257530 - head/gnu/usr.bin/binutils/ld

Brooks Davis brooks at FreeBSD.org
Fri Nov 1 22:03:20 UTC 2013


Author: brooks
Date: Fri Nov  1 22:03:20 2013
New Revision: 257530
URL: http://svnweb.freebsd.org/changeset/base/257530

Log:
  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.
  
  Reported by:	luigi
  Sponsored by:	DARPA/AFRL
  MFC after:	3 days

Modified:
  head/gnu/usr.bin/binutils/ld/Makefile

Modified: head/gnu/usr.bin/binutils/ld/Makefile
==============================================================================
--- head/gnu/usr.bin/binutils/ld/Makefile	Fri Nov  1 21:21:14 2013	(r257529)
+++ head/gnu/usr.bin/binutils/ld/Makefile	Fri Nov  1 22:03:20 2013	(r257530)
@@ -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-head mailing list