From 8d6d1e015984a41d4eb2bd9d8ad9ec100d77fadf Mon Sep 17 00:00:00 2001
From: zrj <rimvydas.jasinskas@gmail.com>
Date: Sun, 20 May 2018 17:14:18 +0300
Subject: [PATCH] boot/pc32: Fix typo in mbr.

Wrong patch in faa6f4d7da5ad6ef2d3e68dd2671b6d6f8161a9b,
the generated mbr was still OK (bmake warning).

While there, only extract XREADORG constant from boot1*.out and not
from bootasmdef.nx in case it ever get one.
---
 sys/boot/pc32/boot2/Makefile | 2 +-
 sys/boot/pc32/mbr/Makefile   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys/boot/pc32/boot2/Makefile b/sys/boot/pc32/boot2/Makefile
index 5c9f07af1d..9ad764b168 100644
--- a/sys/boot/pc32/boot2/Makefile
+++ b/sys/boot/pc32/boot2/Makefile
@@ -124,7 +124,7 @@ boot2$s.o: boot2$s.s
 
 boot2$s.h: boot1$s.out bootasmdef.nx
 	@echo "NOTE: boot2 using xread from boot1 at ${REL1}"
-	${NM} -t d ${.ALLSRC} | awk '/([0-9])+ T xread/ \
+	${NM} -t d ${.ALLSRC:M*.out} | awk '/([0-9])+ T xread/ \
 	 	{ x = $$1 - ORG1; \
 		printf("#define XREADORG %#x\n", REL1 + x) }' \
 	 	ORG1=${ORG1D} REL1=${REL1D} > boot2$s.h
diff --git a/sys/boot/pc32/mbr/Makefile b/sys/boot/pc32/mbr/Makefile
index 58bbb6ffe0..4127c6ca40 100644
--- a/sys/boot/pc32/mbr/Makefile
+++ b/sys/boot/pc32/mbr/Makefile
@@ -9,7 +9,7 @@ BINMODE=	444
 ORG=	0x600
 
 mbr: mbr.o
-	${LD} ${LDFLAGS:-Wl,*} -N -e start -Ttext ${ORG} -o mbr.out mbr.o
+	${LD} ${LDFLAGS:N-Wl,*} -N -e start -Ttext ${ORG} -o mbr.out mbr.o
 	objcopy -S -O binary mbr.out ${.TARGET}
 
 CLEANFILES+= mbr.out mbr.o
-- 
2.11.4.GIT