diff options
| author | andrew <andrew@FreeBSD.org> | 2015-04-13 16:00:09 +0000 |
|---|---|---|
| committer | andrew <andrew@FreeBSD.org> | 2015-04-13 16:00:09 +0000 |
| commit | cedf592dcd7979fec641b12e0bb38b18f61afd70 (patch) | |
| tree | e18fe636465ccc38af2cfb31304ce75487701f8b /sys/boot/efi/loader | |
| parent | 3278a55c03722c3558ee15e7ea6a2750bbcb2d98 (diff) | |
| download | FreeBSD-src-cedf592dcd7979fec641b12e0bb38b18f61afd70.zip FreeBSD-src-cedf592dcd7979fec641b12e0bb38b18f61afd70.tar.gz | |
Create the correct symlinks for the machine directory, and only create the
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
Diffstat (limited to 'sys/boot/efi/loader')
| -rw-r--r-- | sys/boot/efi/loader/Makefile | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/sys/boot/efi/loader/Makefile b/sys/boot/efi/loader/Makefile index db5d3fa..68e9a5b 100644 --- a/sys/boot/efi/loader/Makefile +++ b/sys/boot/efi/loader/Makefile @@ -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 |
