Date: Mon, 13 Jun 2022 17:35:57 GMT From: Brooks Davis <brooks@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: d07600c56303 - main - amd64: symlink i386 includes into build dir Message-ID: <202206131735.25DHZvDG061170@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=d07600c563039f252becc29ac7d9a454b6b0600d commit d07600c563039f252becc29ac7d9a454b6b0600d Author: Brooks Davis <brooks@FreeBSD.org> AuthorDate: 2022-06-13 17:35:38 +0000 Commit: Brooks Davis <brooks@FreeBSD.org> CommitDate: 2022-06-13 17:35:38 +0000 amd64: symlink i386 includes into build dir By creating an i386 symlink, this allows code compiled with -m32 to build (32-bit vdso and linux bits) when -m32 support requires files in the i386 hierarchy. Reviewed by: jhb, imp --- sys/conf/kern.post.mk | 3 +++ sys/conf/kmod.mk | 3 +++ 2 files changed, 6 insertions(+) diff --git a/sys/conf/kern.post.mk b/sys/conf/kern.post.mk index 4fcae712e974..d08dfe30d7de 100644 --- a/sys/conf/kern.post.mk +++ b/sys/conf/kern.post.mk @@ -360,6 +360,9 @@ _ILINKS+= ${MACHINE_CPUARCH} .if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64" _ILINKS+= x86 .endif +.if ${MACHINE_CPUARCH} == "amd64" +_ILINKS+= i386 +.endif # Ensure that the link exists without depending on it when it exists. # Ensure that debug info references the path in the source tree. diff --git a/sys/conf/kmod.mk b/sys/conf/kmod.mk index 63041480eca9..b67c84faea07 100644 --- a/sys/conf/kmod.mk +++ b/sys/conf/kmod.mk @@ -283,6 +283,9 @@ _ILINKS=machine .if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64" _ILINKS+=x86 .endif +.if ${MACHINE_CPUARCH} == "amd64" +_ILINKS+=i386 +.endif CLEANFILES+=${_ILINKS} all: ${PROG}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202206131735.25DHZvDG061170>