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
freebsd · Jun 13, 2022 · d07600c · d07600c
1 parent a09ea2b
commit d07600c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git 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
@@ -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}