Index: head/gnu/usr.bin/binutils/ld/Makefile =================================================================== --- head/gnu/usr.bin/binutils/ld/Makefile +++ head/gnu/usr.bin/binutils/ld/Makefile @@ -63,6 +63,9 @@ HOST= ${TARGET_TUPLE} LIBSEARCHPATH= \"=/lib\":\"=/usr/lib\" .for ext in ${ELF_SCR_EXT} +.if !empty(LDSCRIPTS) && ${LDSCRIPTS:M${NATIVE_EMULATION}.${ext}} != "" +.error "NATIVE_EMULATION scripts were added to LDSCRIPTS: ${LDSCRIPTS:M${NATIVE_EMULATION}.${ext}}" +.endif LDSCRIPTS+= ${NATIVE_EMULATION}.${ext} ldscripts/${NATIVE_EMULATION}.${ext}: e${NATIVE_EMULATION}.c .endfor Index: head/gnu/usr.bin/binutils/ld/Makefile.mips =================================================================== --- head/gnu/usr.bin/binutils/ld/Makefile.mips +++ head/gnu/usr.bin/binutils/ld/Makefile.mips @@ -18,14 +18,14 @@ MIPS_ABIS=elf32btsmip_fbsd elf32ltsmip_fbsd elf64btsmip_fbsd elf64ltsmip_fbsd \ elf32btsmipn32_fbsd elf32ltsmipn32_fbsd .for abi in ${MIPS_ABIS} -#.if (${abi} != ${NATIVE_EMULATION}) EMS+= ${abi} -#.endif +.if ${abi} != ${NATIVE_EMULATION} .for ext in ${ELF_SCR_EXT} LDSCRIPTS+= ${abi}.${ext} ldscripts/${abi}.${ext}: e${abi}.c .endfor -SRCS+= e${abi}.c +.endif +SRCS+= e${abi}.c CLEANFILES+= e${abi}.c # nb: elf32 handles both elf32 and elf64 targets e${abi}.c: ${.CURDIR}/${abi}.sh emultempl/elf32.em \