diff options
| author | dim <dim@FreeBSD.org> | 2014-01-04 22:00:07 +0000 |
|---|---|---|
| committer | dim <dim@FreeBSD.org> | 2014-01-04 22:00:07 +0000 |
| commit | 385c846a94c1cf050fad80f9421fdb7e8d3281c3 (patch) | |
| tree | 144b4d198bb6348b38d5753bf726ff51d072f8f6 /sys/boot/i386/boot2/Makefile | |
| parent | 3a06a5ceae4531c2f3b1c80b21c125a9b3fbd582 (diff) | |
| download | FreeBSD-src-385c846a94c1cf050fad80f9421fdb7e8d3281c3.zip FreeBSD-src-385c846a94c1cf050fad80f9421fdb7e8d3281c3.tar.gz | |
MFC r260095:
For sys/boot/i386 and sys/boot/pc98, separate flags to be passed
directly to the linker (LD_FLAGS) from flags passed indirectly, via the
compiler driver (LDFLAGS).
This is because several Makefiles under sys/boot/i386 and sys/boot/pc98
use ${LD} directly to link, and the normal LDFLAGS value should not be
used in these cases.
Diffstat (limited to 'sys/boot/i386/boot2/Makefile')
| -rw-r--r-- | sys/boot/i386/boot2/Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/boot/i386/boot2/Makefile b/sys/boot/i386/boot2/Makefile index 8f1c150..f9c0ed1 100644 --- a/sys/boot/i386/boot2/Makefile +++ b/sys/boot/i386/boot2/Makefile @@ -44,7 +44,7 @@ CFLAGS.gcc+= -fno-guess-branch-probability \ -fno-unit-at-a-time \ -mno-align-long-strings \ -LDFLAGS=-static -N --gc-sections +LD_FLAGS=-static -N --gc-sections # Pick up ../Makefile.inc early. .include <bsd.init.mk> @@ -60,7 +60,7 @@ boot1: boot1.out objcopy -S -O binary boot1.out ${.TARGET} boot1.out: boot1.o - ${LD} ${LDFLAGS} -e start -Ttext ${ORG1} -o ${.TARGET} boot1.o + ${LD} ${LD_FLAGS} -e start -Ttext ${ORG1} -o ${.TARGET} boot1.o CLEANFILES+= boot2 boot2.ld boot2.ldr boot2.bin boot2.out boot2.o \ boot2.s boot2.s.tmp boot2.h sio.o @@ -81,7 +81,7 @@ boot2.bin: boot2.out objcopy -S -O binary boot2.out ${.TARGET} boot2.out: ${BTXCRT} boot2.o sio.o - ${LD} ${LDFLAGS} -Ttext ${ORG2} -o ${.TARGET} ${.ALLSRC} + ${LD} ${LD_FLAGS} -Ttext ${ORG2} -o ${.TARGET} ${.ALLSRC} boot2.o: boot2.s ${CC} ${ACFLAGS} -c boot2.s |
