diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2007-03-26 11:26:56 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2007-03-26 11:26:56 +0000 |
| commit | 73f6b5b25c40f367f48277a5abe061e79d41849d (patch) | |
| tree | e86a4a160a33cd4b838fd8f15a0c13a15c27da96 /curl | |
| parent | 1b09231b1c55a7948408952c7adad83da45775bb (diff) | |
INTEGRATION: CWS hr40 (1.18.4); FILE MERGED
2006/11/28 14:25:54 hjs 1.18.4.2: #i72063# add to CFLAGS instead of overwriting
2006/11/28 14:16:42 hr 1.18.4.1: #i70840#: disable executable stack (linux compiled with GCC)
Diffstat (limited to 'curl')
| -rw-r--r-- | curl/makefile.mk | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/curl/makefile.mk b/curl/makefile.mk index d6fe9bdfbbf4..1c1bc4620412 100644 --- a/curl/makefile.mk +++ b/curl/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.18 $ +# $Revision: 1.19 $ # -# last change: $Author: vg $ $Date: 2006-09-25 13:34:04 $ +# last change: $Author: ihi $ $Date: 2007-03-26 12:26:56 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -61,10 +61,14 @@ curl_CFLAGS+=-I$(SYSBASE)$/usr$/include curl_LDFLAGS+=-L$(SYSBASE)$/usr$/lib .ENDIF # "$(SYSBASE)"!="" +.IF "$(OS)$(COM)$(CPU)"=="LINUXGCCI" +curl_LDFLAGS+=-Wl,-z,noexecstack +.ENDIF + CONFIGURE_DIR=.$/ #relative to CONFIGURE_DIR CONFIGURE_ACTION=.$/configure -CONFIGURE_FLAGS= --without-ssl --without-libidn --enable-ftp --enable-ipv6 --enable-http --disable-gopher --disable-file --disable-ldap --disable-telnet --disable-dict --disable-static CFLAGS="$(curl_CFLAGS)" LDFLAGS="$(curl_LDFLAGS)" +CONFIGURE_FLAGS= --without-ssl --without-libidn --enable-ftp --enable-ipv6 --enable-http --disable-gopher --disable-file --disable-ldap --disable-telnet --disable-dict --disable-static ADDCFLAGS="$(curl_CFLAGS)" LDFLAGS="$(curl_LDFLAGS)" BUILD_DIR=$(CONFIGURE_DIR)$/lib .IF "$(OS)"=="IRIX" @@ -114,4 +118,4 @@ OUT2INC= \ .INCLUDE : set_ext.mk .INCLUDE : target.mk -.INCLUDE : tg_ext.mk
\ No newline at end of file +.INCLUDE : tg_ext.mk |