mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2024-12-22 11:17:19 +00:00
Code Issues Releases Activity

Create the correct symlinks for the machine directory, and only create the

Browse Source 
x86 symlink on i386 and amd64. Before this incorrect symlinks were being
created on armi and i386.

Differential Revision:	https://reviews.freebsd.org/D2283
Reviewed by:	emaste, imp
Sponsored by:	The FreeBSD Foundation
This commit is contained in:
Andrew Turner 2015-04-13 16:00:09 +00:00
parent 34c15db9cd
commit 2d790e26e5
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=281496
2 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sys/boot/efi/boot1/Makefile
View File

@ -90,13 +90,16 @@ CLEANFILES= boot1.efi boot1.efifat
.include <bsd.prog.mk>
.if ${MACHINE_CPUARCH} == "amd64" || ${MACHINE_CPUARCH} == "i386"
beforedepend ${OBJS}: machine x86
beforedepend ${OBJS}: machine
CLEANFILES+= machine x86
CLEANFILES+= machine
machine:
ln -sf ${.CURDIR}/../../../amd64/include machine
ln -sf ${.CURDIR}/../../../${MACHINE}/include machine
.if ${MACHINE_CPUARCH} == "amd64" || ${MACHINE_CPUARCH} == "i386"
beforedepend ${OBJS}: x86
CLEANFILES+= x86
x86:
ln -sf ${.CURDIR}/../../../x86/include x86

11
sys/boot/efi/loader/Makefile
View File

@ -111,12 +111,17 @@ LDADD= ${LIBFICL} ${LIBEFI} ${LIBFDT} ${LIBEFI_FDT} ${LIBSTAND}
.include <bsd.prog.mk>
beforedepend ${OBJS}: machine x86
beforedepend ${OBJS}: machine
CLEANFILES+= machine x86
CLEANFILES+= machine
machine:
ln -sf ${.CURDIR}/../../../amd64/include machine
ln -sf ${.CURDIR}/../../../${MACHINE}/include machine
.if ${MACHINE_CPUARCH} == "amd64" || ${MACHINE_CPUARCH} == "i386"
beforedepend ${OBJS}: x86
CLEANFILES+= x86
x86:
ln -sf ${.CURDIR}/../../../x86/include x86
.endif