diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2007-03-26 11:25:49 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2007-03-26 11:25:49 +0000 |
| commit | 1b09231b1c55a7948408952c7adad83da45775bb (patch) | |
| tree | c36236f4510595172a17f44255185b7cdb53bad8 /icu | |
| parent | 1ce5a2399798310a25804d268e5c082cebfe5e9e (diff) | |
INTEGRATION: CWS hr40 (1.30.6); FILE MERGED
2007/02/19 17:13:21 hr 1.30.6.5: RESYNC: (1.30-1.33); FILE MERGED
2006/12/06 13:20:50 hr 1.30.6.4: #i70840#: typo
2006/12/06 12:17:57 hr 1.30.6.3: #i70840#: disable executable stack (Linux)
2006/11/28 12:55:59 hr 1.30.6.2: #i70840#: disable executable stack only for Linux on Intel compiled with GCC
2006/11/28 10:40:49 hr 1.30.6.1: #i70840#: disable executable stack (Linux)
Diffstat (limited to 'icu')
| -rw-r--r-- | icu/makefile.mk | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/icu/makefile.mk b/icu/makefile.mk index 664c2973ced4..cb65bb6b7b24 100644 --- a/icu/makefile.mk +++ b/icu/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.33 $ +# $Revision: 1.34 $ # -# last change: $Author: obo $ $Date: 2007-01-25 13:37:16 $ +# last change: $Author: ihi $ $Date: 2007-03-26 12:25:49 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -72,6 +72,11 @@ icu_CFLAGS+=$(C_RESTRICTIONFLAGS) icu_LDFLAGS+=-L$(SYSBASE)$/usr$/lib .ENDIF # "$(SYSBASE)"!="" +# Disable executable stack +.IF "$(OS)$(COM)"=="LINUXGCC" +icu_LDFLAGS+=-Wl,-z,noexecstack +.ENDIF + icu_CFLAGS+=-O $(ARCH_FLAGS) icu_CXXFLAGS+=-O $(ARCH_FLAGS) |