diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2007-03-26 11:24:50 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2007-03-26 11:24:50 +0000 |
| commit | b8f3716b3a927908457b822402d0700c1fc41d43 (patch) | |
| tree | 9679bbf936d1e839b5839bd365276f628ee3b06b /berkeleydb | |
| parent | 1e14da8cc95f26d869174ae2decc27d2355f8bd4 (diff) | |
INTEGRATION: CWS hr40 (1.33.2); FILE MERGED
2007/02/19 17:13:14 hr 1.33.2.3: RESYNC: (1.33-1.34); FILE MERGED
2006/12/01 18:26:09 hr 1.33.2.2: #i70840#: the -Wl,-z,noexecstack switch is available on all systems with GNU ld
2006/11/28 15:11:02 hr 1.33.2.1: #i70840#: disable executable stack (linux compiled with GCC)
Diffstat (limited to 'berkeleydb')
| -rw-r--r-- | berkeleydb/makefile.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/berkeleydb/makefile.mk b/berkeleydb/makefile.mk index d2513300ec2e..81fc4076929b 100644 --- a/berkeleydb/makefile.mk +++ b/berkeleydb/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.34 $ +# $Revision: 1.35 $ # -# last change: $Author: obo $ $Date: 2007-01-25 12:11:56 $ +# last change: $Author: ihi $ $Date: 2007-03-26 12:24:50 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -67,7 +67,7 @@ PATCH_FILE_NAME=db-4.2.52.patch .IF "$(GUI)"=="UNX" .IF "$(OS)$(COM)"=="LINUXGCC" -LDFLAGS:=-Wl,-rpath,'$$$$ORIGIN' +LDFLAGS:=-Wl,-rpath,'$$$$ORIGIN' -Wl,-z,noexecstack .EXPORT: LDFLAGS .ENDIF # "$(OS)$(COM)"=="LINUXGCC" .IF "$(OS)$(COM)"=="SOLARISC52" |