Allow easier override of the configure tuple, in case you wanted to build

as "powerpc-obrien-freebsd" rahter than "powerpc-unknown-freebsd" for example.

4 files changed, 37 insertions, 29 deletions

diff --git a/gnu/usr.bin/binutils/ld/Makefile.alpha b/gnu/usr.bin/binutils/ld/Makefile.alpha
index 43a2d8f..0610e8d 100644
--- a/gnu/usr.bin/binutils/ld/Makefile.alpha
+++ b/gnu/usr.bin/binutils/ld/Makefile.alpha
@@ -1,9 +1,11 @@
 # $FreeBSD$
 
+TARGET_TUPLE=	alpha-unknown-freebsd
+
 .if ${TARGET_ARCH} == "alpha"
-HOST=	alpha-unknown-freebsd
+HOST=	${TARGET_TUPLE}
 CFLAGS+= -DDEFAULT_EMULATION=\"elf64alpha\"
-CFLAGS+= -DTARGET=\"alpha-unknown-freebsd\"
+CFLAGS+= -DTARGET=\"${TARGET_TUPLE}\"
 _alpha_path=	\"/usr/lib\"
 .else
 _alpha_path=	\"/usr/cross/alpha-freebsd/usr/lib\"
@@ -18,11 +20,11 @@ CLEANFILES+=	eelf64alpha.c ealpha.c
 eelf64alpha.c:	emulparams/elf64alpha.sh emultempl/elf32.em \
 		scripttempl/elf.sc genscripts.sh stringify.sed
 	sh ${.CURDIR}/genscripts.sh ${SRCDIR}/ld ${_alpha_path} \
-	    ${HOST} alpha-unknown-freebsd alpha-unknown-freebsd \
-	    elf64alpha ""  elf64alpha alpha-unknown-freebsd
+	    ${HOST} ${TARGET_TUPLE} ${TARGET_TUPLE} \
+	    elf64alpha ""  elf64alpha ${TARGET_TUPLE}
 
 ealpha.c: emulparams/elf64alpha.sh emultempl/elf32.em scripttempl/elf.sc \
     genscripts.sh stringify.sed
 	sh ${.CURDIR}/genscripts.sh ${SRCDIR}/ld ${_alpha_path} \
-	    ${HOST} alpha-unknown-freebsd alpha-unknown-freebsd \
-	    elf64alpha ""  alpha alpha-unknown-freebsd
+	    ${HOST} ${TARGET_TUPLE} ${TARGET_TUPLE} \
+	    elf64alpha ""  alpha ${TARGET_TUPLE}
diff --git a/gnu/usr.bin/binutils/ld/Makefile.i386 b/gnu/usr.bin/binutils/ld/Makefile.i386
index cd3fa55..4f58b2d 100644
--- a/gnu/usr.bin/binutils/ld/Makefile.i386
+++ b/gnu/usr.bin/binutils/ld/Makefile.i386
@@ -1,9 +1,11 @@
 # $FreeBSD$
 
+TARGET_TUPLE=	i386-unknown-freebsd
+
 .if ${TARGET_ARCH} == "i386"
-HOST=	i386-unknown-freebsd
+HOST=	${TARGET_TUPLE}
 CFLAGS+= -DDEFAULT_EMULATION=\"elf_i386\"
-CFLAGS+= -DTARGET=\"i386-unknown-freebsd\"
+CFLAGS+= -DTARGET=\"${TARGET_TUPLE}\"
 _i386_path=	\"/usr/lib\"
 .else
 _i386_path=	\"/usr/cross/i386-freebsd/usr/lib\"
@@ -17,8 +19,8 @@ CLEANFILES+=	eelf_i386.c
 eelf_i386.c: emulparams/elf_i386.sh emultempl/elf32.em scripttempl/elf.sc \
     genscripts.sh stringify.sed
 	sh ${.CURDIR}/genscripts.sh ${SRCDIR}/ld ${_i386_path} \
-	    ${HOST} i386-unknown-freebsd i386-unknown-freebsd \
-	    elf_i386 "" elf_i386 i386-unknown-freebsd
+	    ${HOST} ${TARGET_TUPLE} ${TARGET_TUPLE} \
+	    elf_i386 "" elf_i386 ${TARGET_TUPLE}
 
 .if defined(BINUTILSDISTDIR) && exists(${BINUTILSDISTDIR})
 EMS+=		ld_i386pe_emulation
@@ -33,7 +35,7 @@ CLEANFILES+=	ei386pe.c
 ei386pe.c: emulparams/i386pe.sh emultempl/pe.em scripttempl/pe.sc \
     genscripts.sh stringify.sed
 	sh ${.CURDIR}/genscripts.sh ${BINUTILSDISTDIR}/ld \
-	    /usr/cross/winnt/lib ${HOST} i386-unknown-freebsdwinnt \
-	    i386-unknown-freebsdwinnt i386pe "" i386pe \
-	    i386-unknown-freebsdwinnt
+	    /usr/cross/winnt/lib ${HOST} ${TARGET_TUPLE}winnt \
+	    ${TARGET_TUPLE}winnt i386pe "" i386pe \
+	    ${TARGET_TUPLE}winnt
 .endif
diff --git a/gnu/usr.bin/binutils/ld/Makefile.powerpc b/gnu/usr.bin/binutils/ld/Makefile.powerpc
index 59fad24..db715fc 100644
--- a/gnu/usr.bin/binutils/ld/Makefile.powerpc
+++ b/gnu/usr.bin/binutils/ld/Makefile.powerpc
@@ -1,9 +1,11 @@
 # $FreeBSD$
 
+TARGET_TUPLE=	powerpc-unknown-freebsd
+
 .if ${TARGET_ARCH} == "powerpc"
-HOST=	powerpc-unknown-freebsd
+HOST=	${TARGET_TUPLE}
 CFLAGS+= -DDEFAULT_EMULATION=\"elf_powerpc\"
-CFLAGS+= -DTARGET=\"powerpc-unknown-freebsd\"
+CFLAGS+= -DTARGET=\"${TARGET_TUPLE}\"
 _powerpc_path=	\"/usr/lib\"
 .else
 _powerpc_path=	\"/usr/cross/powerpc-freebsd/usr/lib\"
@@ -61,27 +63,27 @@ CLEANFILES+=	eelf32ppc.c		\
 eelf32ppc.c: emulparams/elf32ppc.sh emultempl/elf32.em scripttempl/elfppc.sc \
     genscripts.sh stringify.sed
 	sh ${.CURDIR}/genscripts.sh ${BINUTILSDISTDIR}/ld \
-	    ${_powerpc_path} ${HOST} powerpc-unknown-freebsd \
-	    powerpc-unknown-freebsd elf32ppc "" elf32ppc
+	    ${_powerpc_path} ${HOST} ${TARGET_TUPLE} \
+	    ${TARGET_TUPLE} elf32ppc "" elf32ppc
 
 eppcmacos.c: emulparams/ppcmacos.sh emultempl/aix.em scripttempl/aix.sc \
     genscripts.sh stringify.sed
 	sh ${.CURDIR}/genscripts.sh ${BINUTILSDISTDIR}/ld \
 	    /usr/cross/powerpc_macos/usr/lib ${HOST} \
-	    powerpc-unknown-freebsdmacos \
-	    powerpc-unknown-freebsdmacos ppcmacos "" ppcmacos
+	    ${TARGET_TUPLE}macos \
+	    ${TARGET_TUPLE}macos ppcmacos "" ppcmacos
 
 eppcnw.c: emulparams/ppcnw.sh emultempl/elf32.em scripttempl/nw.sc \
     genscripts.sh stringify.sed
 	sh ${.CURDIR}/genscripts.sh ${BINUTILSDISTDIR}/ld \
-	    /usr/cross/powerpc_nw/usr/lib ${HOST} powerpc-unknown-freebsdnw \
-	    powerpc-unknown-freebsdnw ppcnw "" ppcnw
+	    /usr/cross/powerpc_nw/usr/lib ${HOST} ${TARGET_TUPLE}nw \
+	    ${TARGET_TUPLE}nw ppcnw "" ppcnw
 
 eppcpe.c: emulparams/ppcpe.sh emultempl/pe.em scripttempl/ppcpe.sc \
     genscripts.sh stringify.sed
 	sh ${.CURDIR}/genscripts.sh ${BINUTILSDISTDIR}/ld \
-	    /usr/cross/powerpc_pe/usr/lib ${HOST} powerpc-unknown-freebsdpe \
-	    powerpc-unknown-freebsdpe ppcpe "" ppcpe
+	    /usr/cross/powerpc_pe/usr/lib ${HOST} ${TARGET_TUPLE}pe \
+	    ${TARGET_TUPLE}pe ppcpe "" ppcpe
 
 eaixrs6.c: emulparams/aixrs6.sh emultempl/aix.em scripttempl/aix.sc \
     genscripts.sh stringify.sed
diff --git a/gnu/usr.bin/binutils/ld/Makefile.sparc64 b/gnu/usr.bin/binutils/ld/Makefile.sparc64
index a227867..19240e8 100644
--- a/gnu/usr.bin/binutils/ld/Makefile.sparc64
+++ b/gnu/usr.bin/binutils/ld/Makefile.sparc64
@@ -1,9 +1,11 @@
 # $FreeBSD$
 
+TARGET_TUPLE=	sparc64-unknown-freebsd
+
 .if ${TARGET_ARCH} == "sparc64"
-HOST=	sparc64-unknown-freebsd
+HOST=	${TARGET_TUPLE}
 CFLAGS+= -DDEFAULT_EMULATION=\"elf32_sparc\"
-CFLAGS+= -DTARGET=\"sparc64-unknown-freebsd\"
+CFLAGS+= -DTARGET=\"${TARGET_TUPLE}\"
 _sparc_path=	\"/usr/lib\"
 .else
 _sparc_path=	\"/usr/cross/sparc-freebsd/usr/lib\"
@@ -24,11 +26,11 @@ CLEANFILES+=	eelf32_sparc.c
 eelf64_sparc.c: emulparams/elf64_sparc.sh emultempl/elf32.em \
     scripttempl/elf.sc genscripts.sh stringify.sed
 	sh ${.CURDIR}/genscripts.sh ${SRCDIR}/ld ${_sparc_path} \
-	    ${HOST} sparc64-unknown-freebsd sparc64-unknown-freebsd \
-	    elf64_sparc "" elf64_sparc sparc64-unknown-freebsd
+	    ${HOST} ${TARGET_TUPLE} ${TARGET_TUPLE} \
+	    elf64_sparc "" elf64_sparc ${TARGET_TUPLE}
 
 eelf32_sparc.c: emulparams/elf32_sparc.sh emultempl/elf32.em \
     scripttempl/elf.sc genscripts.sh stringify.sed
 	sh ${.CURDIR}/genscripts.sh ${SRCDIR}/ld ${_sparc_path} \
-	    ${HOST} sparc64-unknown-freebsd sparc64-unknown-freebsd \
-	    elf32_sparc "" elf32_sparc sparc64-unknown-freebsd
+	    ${HOST} ${TARGET_TUPLE} ${TARGET_TUPLE} \
+	    elf32_sparc "" elf32_sparc ${TARGET_TUPLE}