Author: arichardson Date: Wed Jan 9 11:13:05 2019 New Revision: 342882 URL: https://svnweb.freebsd.org/changeset/base/342882
Log: Avoid bsd.files.mk duplicate rule warning for bfd ldscripts Without this change I get lots of warning: duplicate script for target "_FILESINS_ldscripts/elf64btsmip_fbsd.xw" ignored message for every tree walk. Reviewed By: imp, emaste Differential Revision: https://reviews.freebsd.org/D18783 Modified: head/gnu/usr.bin/binutils/ld/Makefile head/gnu/usr.bin/binutils/ld/Makefile.mips Modified: head/gnu/usr.bin/binutils/ld/Makefile ============================================================================== --- head/gnu/usr.bin/binutils/ld/Makefile Wed Jan 9 11:04:27 2019 (r342881) +++ head/gnu/usr.bin/binutils/ld/Makefile Wed Jan 9 11:13:05 2019 (r342882) @@ -63,6 +63,9 @@ FILESDIR= ${SCRIPTDIR} 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 Modified: head/gnu/usr.bin/binutils/ld/Makefile.mips ============================================================================== --- head/gnu/usr.bin/binutils/ld/Makefile.mips Wed Jan 9 11:04:27 2019 (r342881) +++ head/gnu/usr.bin/binutils/ld/Makefile.mips Wed Jan 9 11:13:05 2019 (r342882) @@ -18,14 +18,14 @@ NATIVE_EMULATION?=elf32${_EMULATION_ENDIAN}tsmip_fbsd 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 \ _______________________________________________ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
