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/hppa64/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/hppa64/conf')
| -rw-r--r-- | sys/arch/hppa64/conf/Makefile.hppa64 | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/arch/hppa64/conf/Makefile.hppa64 b/sys/arch/hppa64/conf/Makefile.hppa64 index 2a76409f1ba..355e5290850 100644 --- a/sys/arch/hppa64/conf/Makefile.hppa64 +++ b/sys/arch/hppa64/conf/Makefile.hppa64 @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.hppa64,v 1.49 2014/10/04 18:10:14 brad Exp $ +# $OpenBSD: Makefile.hppa64,v 1.50 2014/11/18 01:17:36 deraadt Exp $ # For instructions on building kernels consult the config(8) and options(4) # manual pages. @@ -36,8 +36,8 @@ CMACHFLAGS+= -fno-stack-protector COPTS?= -O2 CFLAGS= ${DEBUG} ${CWARNFLAGS} ${CMACHFLAGS} ${COPTS} ${PIPE} AFLAGS= -D_LOCORE -x assembler-with-cpp ${CWARNFLAGS} ${CMACHFLAGS} -LINKFLAGS= -X -T ${_machdir}/conf/ld.script -Ttext 80000 --warn-common \ - -nopie +LDSCRIPT= ${_machdir}/conf/ld.script +LINKFLAGS= -X -T ${LDSCRIPT} -Ttext 80000 --warn-common -nopie .if ${IDENT:M-DDDB} != "" CFLAGS+= -fno-omit-frame-pointer @@ -71,7 +71,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} |