Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix the build: provide compatibility with ports that define KERNLDSCRIPT to

Browse Source 
a file?
This commit is contained in:
christos 2015-08-24 18:02:55 +00:00
parent 2266c911f6
commit ef44aed886
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sys/conf/Makefile.kern.inc
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile.kern.inc,v 1.188 2015/08/24 15:50:47 uebayasi Exp $
# $NetBSD: Makefile.kern.inc,v 1.189 2015/08/24 18:02:55 christos Exp $
#
# This file contains common `MI' targets and definitions and it is included
# at the bottom of each `MD' ${MACHINE}/conf/Makefile.${MACHINE}.
@ -230,8 +230,12 @@ SYSTEM_OBJ?= ${MD_OBJS} ${MI_OBJS} ${OBJS:O} ${SYSLIBCOMPAT} ${LIBKERN}
.endif
SYSTEM_DEP+= Makefile ${SYSTEM_OBJ} .gdbinit
.if defined(KERNLDSCRIPT)
.if exists(${KERNLDSCRIPT})
SYSTEM_DEP+= -T ${KERNLDSCRIPT}
.else
SYSTEM_DEP+= ${.TARGET}.ldscript
.endif
.endif
.if defined(CTFMERGE)
SYSTEM_CTFMERGE= ${CTFMERGE} ${CTFMFLAGS} -o ${.TARGET} ${SYSTEM_OBJ} ${EXTRA_OBJ} vers.o
.else
@ -256,8 +260,12 @@ EXTRA_CLEAN+= ${k}.ldscript
${k}.ldscript: ${KERNLDSCRIPT}
${CPP} ${KERNLDSCRIPT} | grep -v '^#' >$@
.endfor
.if exists(${KERNLDSCRIPT})
LINKSCRIPT= -T ${KERNLDSCRIPT}
.else
LINKSCRIPT= -T ${.TARGET}.ldscript
.endif
.endif
TEXTADDR?= ${LOADADDRESS} # backwards compatibility
LINKTEXT?= ${TEXTADDR:C/.+/-Ttext &/}