Remove the -nostdlib stuff I added. Instead, fix LDFLAGS to be honored

correctly with the new Makefile.inc include order.

Sponsored by: Netflix
This commit is contained in:
Warner Losh 2017-10-30 23:14:44 +00:00
parent 9d9576461b
commit 0914e17a4e
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=325172
2 changed files with 3 additions and 5 deletions

View File

@ -13,8 +13,8 @@ BOOTBLOCKBASE= 0x4000
CFLAGS.clang+=-mcmodel=small
CFLAGS.gcc+=-mcmodel=medlow
CFLAGS+=-Os -I${LDRSRC} -nostdlib
LDFLAGS=-Ttext ${BOOTBLOCKBASE} -Wl,-N
CFLAGS+=-Os -I${LDRSRC}
LDFLAGS+=-Ttext ${BOOTBLOCKBASE} -Wl,-N
# Construct boot1. sunlabel expects it to contain zeroed-out space for the
# label, and to be of the correct size.

View File

@ -25,8 +25,6 @@ LOADER_GZIP_SUPPORT?= yes
LOADER_BZIP2_SUPPORT?= no
LOADER_DEBUG?= no
CFLAGS+=-nostdlib
.if ${LOADER_DEBUG} == "yes"
CFLAGS+= -DLOADER_DEBUG
.endif
@ -43,7 +41,7 @@ CFLAGS+= -I.
CLEANFILES+= loader.help
LDFLAGS= -static
LDFLAGS+= -static
# Open Firmware standalone support library
LIBOFW= ${BOOTOBJ}/ofw/libofw/libofw.a