diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2014-11-18 01:17:38 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2014-11-18 01:17:38 +0000 |
| commit | d219bd78432b35acf206f963198b3ee8381dca44 (patch) | |
| tree | 8fb1d2392ea88e10fcc0616d6f591140f2524d95 /sys/arch/sparc/conf | |
| parent | 15c2dd2768cab5e369a3264da0ee5847bbc29f1b (diff) | |
(except for the arm architectures...) unify the way the ld.script is
used and depended, mimicking new changes by guenther to amd64.
Diffstat (limited to 'sys/arch/sparc/conf')
| -rw-r--r-- | sys/arch/sparc/conf/Makefile.sparc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sys/arch/sparc/conf/Makefile.sparc b/sys/arch/sparc/conf/Makefile.sparc index 00dd53de7c1..0b468f00f00 100644 --- a/sys/arch/sparc/conf/Makefile.sparc +++ b/sys/arch/sparc/conf/Makefile.sparc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.sparc,v 1.81 2014/10/04 18:10:14 brad Exp $ +# $OpenBSD: Makefile.sparc,v 1.82 2014/11/18 01:17:37 deraadt Exp $ # For instructions on building kernels consult the config(8) and options(4) # manual pages. @@ -41,7 +41,8 @@ CMACHFLAGS+= -fno-stack-protector COPTS?= -O2 CFLAGS= ${DEBUG} ${CWARNFLAGS} ${CMACHFLAGS} ${COPTS} ${PIPE} AFLAGS= -D_LOCORE -x assembler-with-cpp ${CWARNFLAGS} ${CMACHFLAGS} -LINKFLAGS= -N -e start -T ${_machdir}/conf/ld.script --warn-common -nopie +LDSCRIPT= ${_machdir}/conf/ld.script +LINKFLAGS= -N -e start -T ${LDSCRIPT} --warn-common -nopie .if ${IDENT:M-DDDB_STRUCT} DB_STRUCTINFO= db_structinfo.h @@ -71,7 +72,7 @@ NORMAL_S= ${CC} ${AFLAGS} ${CPPFLAGS} -c $< # ${SYSTEM_LD_TAIL} SYSTEM_HEAD= locore.o param.o ioconf.o SYSTEM_OBJ= ${SYSTEM_HEAD} ${OBJS} -SYSTEM_DEP= Makefile ${SYSTEM_OBJ} +SYSTEM_DEP= Makefile ${SYSTEM_OBJ} ${LDSCRIPT} SYSTEM_LD_HEAD= @rm -f $@ SYSTEM_LD= @echo ${LD} ${LINKFLAGS} -o $@ '$${SYSTEM_HEAD} vers.o $${OBJS}'; \ ${LD} ${LINKFLAGS} -o $@ ${SYSTEM_HEAD} vers.o ${OBJS} |