Don't clobber system LDFLAGS for beri boot loaders.

Prior to r325114, bsd.init.mk was included after assignments to CFLAGS and
LDFLAGS in these Makefiles.  After r325114, bare assignments (= rather than
+=) lost system-assigned default values that are needed when compiling with
an external toolchain.  CFLAGS in both Makefiles already uses +=.  This
commit changes LDFLAGS to use +=.  While here, depend on the LDFLAGS update
in the parent Makefile.inc to set -nostdlib.

Sponsored by:	DARPA / AFRL
This commit is contained in:
John Baldwin 2018-01-03 17:35:38 +00:00
parent 49f053978d
commit a9ca11cb39
2 changed files with 2 additions and 4 deletions

View File

@ -53,8 +53,7 @@ CFLAGS+= -I${LDRSRC} \
-fno-pic -mno-abicalls \
-g
LDFLAGS= -nostdlib \
-static \
LDFLAGS+= -static \
-Wl,-N \
-G0 \
-L${.CURDIR}

View File

@ -85,8 +85,7 @@ CFLAGS+= -G0 \
-mno-abicalls \
-g
LDFLAGS= -nostdlib \
-static \
LDFLAGS+= -static \
-T ${.CURDIR}/loader.ldscript \
-L${.CURDIR} \
-e __start