Skip to content

Commit d07600c

Browse files
committed
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
1 parent a09ea2b commit d07600c

File tree

2 files changed

+6
-0
lines changed

2 files changed

+6
-0
lines changed

sys/conf/kern.post.mk

+3
Original file line numberDiff line numberDiff line change
@@ -360,6 +360,9 @@ _ILINKS+= ${MACHINE_CPUARCH}
360360
.if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64"
361361
_ILINKS+= x86
362362
.endif
363+
.if ${MACHINE_CPUARCH} == "amd64"
364+
_ILINKS+= i386
365+
.endif
363366

364367
# Ensure that the link exists without depending on it when it exists.
365368
# Ensure that debug info references the path in the source tree.

sys/conf/kmod.mk

+3
Original file line numberDiff line numberDiff line change
@@ -283,6 +283,9 @@ _ILINKS=machine
283283
.if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64"
284284
_ILINKS+=x86
285285
.endif
286+
.if ${MACHINE_CPUARCH} == "amd64"
287+
_ILINKS+=i386
288+
.endif
286289
CLEANFILES+=${_ILINKS}
287290

288291
all: ${PROG}

0 commit comments

Comments
 (0)