diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2007-03-26 11:25:32 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2007-03-26 11:25:32 +0000 |
| commit | 1ce5a2399798310a25804d268e5c082cebfe5e9e (patch) | |
| tree | 04cb0dd077bfb1bf9a42a4af6b3be8ecab64de84 /libxml2 | |
| parent | b8f3716b3a927908457b822402d0700c1fc41d43 (diff) | |
INTEGRATION: CWS hr40 (1.14.18); FILE MERGED
2006/12/01 18:25:25 hr 1.14.18.3: #i70840#: the -Wl,-z,noexecstack switch is available on all systems with GNU ld
2006/11/28 13:24:06 hjs 1.14.18.2: #i72063# add to CFLAGS instead of overwriting
2006/11/28 12:54:50 hr 1.14.18.1: #i70840#: disable executable stack (Linux)
Diffstat (limited to 'libxml2')
| -rw-r--r-- | libxml2/makefile.mk | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/libxml2/makefile.mk b/libxml2/makefile.mk index 8c29b9bbf438..af2b632647b4 100644 --- a/libxml2/makefile.mk +++ b/libxml2/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.14 $ +# $Revision: 1.15 $ # -# last change: $Author: hr $ $Date: 2005-12-28 16:59:16 $ +# last change: $Author: ihi $ $Date: 2007-03-26 12:25:32 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -74,9 +74,14 @@ xml2_CFLAGS+=$(C_RESTRICTIONFLAGS) .ENDIF # "$(COMNAME)"=="sunpro5" xml2_LDFLAGS+=-L$(SYSBASE)$/usr$/lib .ENDIF # "$(SYSBASE)"!="" + +.IF "$(OS)$(COM)"=="LINUXGCC" +xml2_LDFLAGS+=-Wl,-z,noexecstack +.ENDIF + CONFIGURE_DIR= CONFIGURE_ACTION=.$/configure -CONFIGURE_FLAGS=--enable-ipv6=no --without-python --enable-static=no --with-sax1=yes CFLAGS="$(xml2_CFLAGS)" LDFLAGS="$(xml2_LDFLAGS)" +CONFIGURE_FLAGS=--enable-ipv6=no --without-python --enable-static=no --with-sax1=yes ADDCFLAGS="$(xml2_CFLAGS)" LDFLAGS="$(xml2_LDFLAGS)" BUILD_ACTION=$(GNUMAKE) BUILD_FLAGS+= -j$(EXTMAXPROCESS) BUILD_DIR=$(CONFIGURE_DIR) |