aboutsummaryrefslogtreecommitdiff
path: root/gnu/usr.bin
diff options
context:
space:
mode:
authorDavid E. O'Brien <obrien@FreeBSD.org>2006-11-06 02:20:28 +0000
committerDavid E. O'Brien <obrien@FreeBSD.org>2006-11-06 02:20:28 +0000
commit01ea750bf180035a51a13469f0495c1993208ce0 (patch)
treee83146a4a8138c95bb6f6c0cc8d634dd3b7fab2b /gnu/usr.bin
parent898f5ac04fe9f3d2968513d0cde9aeb10088b5fa (diff)
Notes
Diffstat (limited to 'gnu/usr.bin')
-rw-r--r--gnu/usr.bin/binutils/Makefile.inc2
-rwxr-xr-xgnu/usr.bin/binutils/ld/genscripts.sh5
2 files changed, 5 insertions, 2 deletions
diff --git a/gnu/usr.bin/binutils/Makefile.inc b/gnu/usr.bin/binutils/Makefile.inc
index 393b2b925952..9ce4ca3e5f32 100644
--- a/gnu/usr.bin/binutils/Makefile.inc
+++ b/gnu/usr.bin/binutils/Makefile.inc
@@ -1,6 +1,4 @@
-#
# $FreeBSD$
-#
.if (${TARGET_ARCH} == "alpha")
WARNS?= 2
diff --git a/gnu/usr.bin/binutils/ld/genscripts.sh b/gnu/usr.bin/binutils/ld/genscripts.sh
index 181a96c37515..e606424e3147 100755
--- a/gnu/usr.bin/binutils/ld/genscripts.sh
+++ b/gnu/usr.bin/binutils/ld/genscripts.sh
@@ -37,7 +37,12 @@ CUSTOMIZER_SCRIPT=$3
# FSF BU ver 2.15 which allows for a more generic emulparams processing.
# To reduce the diff, I also include the ${EMULATION_NAME} parameter in uses
# of 'CUSTOMIZER_SCRIPT'.
+
+# XXX: arm hack : until those file are merged back into the FSF repo, just
+# use the version in this directory.
+if !(test -f ${CUSTOMIZER_SCRIPT}"";) then
CUSTOMIZER_SCRIPT="${srcdir}/emulparams/${EMULATION_NAME}.sh"
+fi
# Include the emulation-specific parameters:
. ${CUSTOMIZER_SCRIPT} ${EMULATION_NAME}