diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2007-03-26 11:23:31 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2007-03-26 11:23:31 +0000 |
| commit | 1e14da8cc95f26d869174ae2decc27d2355f8bd4 (patch) | |
| tree | 74574d07a943286446e4699cc197776183b5b61c /python | |
| parent | cbf90903342dabee72e1b63edf52e2f945d0ed3f (diff) | |
INTEGRATION: CWS hr40 (1.27.4); FILE MERGED
2007/02/19 17:12:18 hr 1.27.4.2: RESYNC: (1.27-1.29); FILE MERGED
2006/12/01 18:13:21 hr 1.27.4.1: #i70840#: disable executable stack (LINUX)
Diffstat (limited to 'python')
| -rw-r--r-- | python/makefile.mk | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/python/makefile.mk b/python/makefile.mk index 0f9c4f10ba57..1ee740c0082f 100644 --- a/python/makefile.mk +++ b/python/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.29 $ +# $Revision: 1.30 $ # -# last change: $Author: vg $ $Date: 2007-02-06 14:15:01 $ +# last change: $Author: ihi $ $Date: 2007-03-26 12:23:31 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -99,6 +99,10 @@ python_CFLAGS+=$(C_RESTRICTIONFLAGS) .ENDIF # "$(COMNAME)"=="sunpro5" .ENDIF # "$(SYSBASE)"!="" +.IF "$(OS)$(COM)"=="LINUXGCC" +python_LDFLAGS+=-Wl,-z,noexecstack +.ENDIF + CONFIGURE_ACTION=./configure --prefix=$(MYCWD)/python-inst --enable-shared CFLAGS="$(python_CFLAGS)" LDFLAGS="$(python_LDFLAGS)" .IF "$(OS)$(CPU)" == "SOLARISI" CONFIGURE_ACTION += --disable-ipv6 |