cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Stop using ld -Z on architectures where it is not necessary. For now this

Browse Source 
means amd64 and sparc64.  Hopefully more architectures will follow.

ok jca@
This commit is contained in:
kettenis 2016-06-05 16:56:19 +00:00
parent fc1e7aa66c
commit 70f15ce8a0
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
editors/emacs21/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.83 2016/05/12 01:17:13 naddy Exp $
# $OpenBSD: Makefile,v 1.84 2016/06/05 16:56:19 kettenis Exp $
COMMENT-main= GNU editor: extensible, customizable, self documenting
COMMENT-el= elisp sources for those who want to read/modify them
@ -38,11 +38,13 @@ CONFIGURE_STYLE= gnu dest
CONFIGURE_ARGS= ${GCCARCH} --with-pop --with-system-malloc
# ld -Z doesn't work with secure-PLT
.if ${MACHINE_ARCH} == "powerpc"
ARCH_LDFLAGS = -Wl,--bss-plt
.else
ARCH_LDFLAGS = -Z -Wl,--bss-plt
.elif ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "sparc64"
ARCH_LDFLAGS =
.else
ARCH_LDFLAGS = -Z
.endif
LDFLAGS= -Z ${ARCH_LDFLAGS} -L${LOCALBASE}/lib -nopie
LDFLAGS= ${ARCH_LDFLAGS} -L${LOCALBASE}/lib -nopie
CFLAGS += -fno-pie
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \