The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=b2dcde7e9e75dd35124d12e68036e56ee650d568
commit b2dcde7e9e75dd35124d12e68036e56ee650d568 Author: Ed Maste <[email protected]> AuthorDate: 2022-07-19 19:36:09 +0000 Commit: Ed Maste <[email protected]> CommitDate: 2023-06-26 02:03:19 +0000 Assemble .s to .o using cc, not as As of commit fd71da37d478 we no longer have an `as` in the default toolchain. Although we do not make use of this rule in the base system some ports or downstream projects might. Use `cc -x assembler` instead of as. Reviewed by: arichardson Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D35859 --- share/mk/bsd.compat.mk | 1 - share/mk/bsd.lib.mk | 2 +- share/mk/bsd.suffixes.mk | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/share/mk/bsd.compat.mk b/share/mk/bsd.compat.mk index 9a59020b4df2..aabfd6a06192 100644 --- a/share/mk/bsd.compat.mk +++ b/share/mk/bsd.compat.mk @@ -37,7 +37,6 @@ LIB32_MACHINE= i386 LIB32_MACHINE_ARCH= i386 LIB32WMAKEENV= MACHINE_CPU="i686 mmx sse sse2" LIB32WMAKEFLAGS= \ - AS="${XAS} --32" \ LD="${XLD} -m elf_i386_fbsd" .elif ${COMPAT_ARCH} == "powerpc64" diff --git a/share/mk/bsd.lib.mk b/share/mk/bsd.lib.mk index 9a947b85bfe2..dfaf554a3619 100644 --- a/share/mk/bsd.lib.mk +++ b/share/mk/bsd.lib.mk @@ -192,7 +192,7 @@ PO_FLAG=-pg ${CTFCONVERT_CMD} .s.po .s.pico .s.nossppico .s.pieo: - ${AS} ${AFLAGS} -o ${.TARGET} ${.IMPSRC} + ${CC:N${CCACHE_BIN}} -x assembler ${ACFLAGS} -c ${.IMPSRC} -o ${.TARGET} ${CTFCONVERT_CMD} .asm.po: diff --git a/share/mk/bsd.suffixes.mk b/share/mk/bsd.suffixes.mk index 5396bae05087..8337b9c94102 100644 --- a/share/mk/bsd.suffixes.mk +++ b/share/mk/bsd.suffixes.mk @@ -55,7 +55,7 @@ ${CTFCONVERT_CMD} .s.o: - ${AS} ${AFLAGS} -o ${.TARGET} ${.IMPSRC} + ${CC:N${CCACHE_BIN}} -x assembler ${ACFLAGS} -c ${.IMPSRC} -o ${.TARGET} ${CTFCONVERT_CMD} # XXX not -j safe
