INTEGRATION: CWS hr40 (1.25.22); FILE MERGED

2007/02/19 17:24:20 hr 1.25.22.2: RESYNC: (1.25-1.29); FILE MERGED
2006/11/28 09:51:10 hr 1.25.22.1: #i70840#: disable executable stack
This commit is contained in:
Ivo Hinkelmann 2007-03-26 11:26:28 +00:00
parent ed64537f87
commit b42bed7922

View file

@ -4,9 +4,9 @@
# #
# $RCSfile: unxlngi6.mk,v $ # $RCSfile: unxlngi6.mk,v $
# #
# $Revision: 1.31 $ # $Revision: 1.32 $
# #
# last change: $Author: obo $ $Date: 2007-03-09 09:09:26 $ # last change: $Author: ihi $ $Date: 2007-03-26 12:26:28 $
# #
# The Contents of this file are made available subject to # The Contents of this file are made available subject to
# the terms of GNU Lesser General Public License Version 2.1. # the terms of GNU Lesser General Public License Version 2.1.
@ -157,7 +157,8 @@ LINKC*=$(CC)
# default linker flags # default linker flags
LINKFLAGSDEFS*=-Wl,-z,defs LINKFLAGSDEFS*=-Wl,-z,defs
LINKFLAGSRUNPATH*=-Wl,-rpath,\''$$ORIGIN'\' LINKFLAGSRUNPATH*=-Wl,-rpath,\''$$ORIGIN'\'
LINKFLAGS=-Wl,-z,combreloc $(LINKFLAGSDEFS) $(LINKFLAGSRUNPATH) # flag -Wl,-z,noexecstack sets the NX bit on the stack
LINKFLAGS=-Wl,-z,noexecstack -Wl,-z,combreloc $(LINKFLAGSDEFS) $(LINKFLAGSRUNPATH)
# linker flags for linking applications # linker flags for linking applications
LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec