svn commit: r281496 - in head/sys/boot/efi: boot1 loader

[Andrew Turner]

Author: andrew
Date: Mon Apr 13 16:00:09 2015
New Revision: 281496
URL: https://svnweb.freebsd.org/changeset/base/281496

Log:
  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

Modified:
  head/sys/boot/efi/boot1/Makefile
  head/sys/boot/efi/loader/Makefile

Modified: head/sys/boot/efi/boot1/Makefile
==============================================================================
--- head/sys/boot/efi/boot1/Makefile	Mon Apr 13 15:22:45 2015	(r281495)
+++ head/sys/boot/efi/boot1/Makefile	Mon Apr 13 16:00:09 2015	(r281496)
@@ -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

Modified: head/sys/boot/efi/loader/Makefile
==============================================================================
--- head/sys/boot/efi/loader/Makefile	Mon Apr 13 15:22:45 2015	(r281495)
+++ head/sys/boot/efi/loader/Makefile	Mon Apr 13 16:00:09 2015	(r281496)
@@ -111,12 +111,17 @@ LDADD=		${LIBFICL} ${LIBEFI} ${LIBFDT} $
 
 .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