diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2011-03-09 10:38:32 +0100 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2011-03-09 10:38:32 +0100 |
| commit | 5f7158e265771916e3354aaee7dce0f069d6a613 (patch) | |
| tree | 4d7a7b8941ab618d875f3406f343e4a8a9f18c1b /curl | |
| parent | 760b66947374c025d6d543a935e14c2b70f73b07 (diff) | |
| parent | 70d1752f42910f44cbf13478d0822e06a653b0d6 (diff) | |
Merge commit 'ooo/DEV300_m101' into intm101
Conflicts:
boost/aliasing.patch
boost/makefile.mk
cairo/cairo/makefile.mk
cairo/pixman/makefile.mk
dictionaries/da_DK/README_th_da_DK.txt
dictionaries/da_DK/description.xml
dictionaries/da_DK/dictionaries.xcu
dictionaries/da_DK/makefile.mk
dictionaries/da_DK/th_da_DK.dat
dictionaries/de_AT/th_de_AT_v2.idx
dictionaries/de_CH/th_de_CH_v2.idx
dictionaries/de_DE/COPYING
dictionaries/de_DE/COPYING_GPLv2
dictionaries/de_DE/COPYING_GPLv2.txt
dictionaries/de_DE/README_extension_owner.txt
dictionaries/de_DE/README_th_de_DE_v2.txt
dictionaries/de_DE/makefile.mk
dictionaries/de_DE/th_de_DE_v2.idx
icu/makefile.mk
moz/makefile.mk
python/makefile.mk
Diffstat (limited to 'curl')
| -rw-r--r-- | curl/makefile.mk | 6 | ||||
| -rw-r--r-- | curl/prj/build.lst | 2 |
2 files changed, 2 insertions, 6 deletions
diff --git a/curl/makefile.mk b/curl/makefile.mk index 73234469376f..dfcb77fa1ce4 100644 --- a/curl/makefile.mk +++ b/curl/makefile.mk @@ -67,10 +67,6 @@ 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 - .IF "$(OS)$(CPU)"=="SOLARISU" curl_CFLAGS+:=$(ARCH_FLAGS) curl_LDFLAGS+:=$(ARCH_FLAGS) @@ -101,7 +97,7 @@ curl_CC+=-shared-libgcc .ENDIF curl_LIBS=-lws2_32 -lwinmm .IF "$(MINGW_SHARED_GXXLIB)"=="YES" -curl_LIBS+=-lstdc++_s +curl_LIBS+=$(MINGW_SHARED_LIBSTDCPP) .ENDIF CONFIGURE_DIR=.$/ #relative to CONFIGURE_DIR diff --git a/curl/prj/build.lst b/curl/prj/build.lst index 0c9a91717ecb..d3aab4781144 100644 --- a/curl/prj/build.lst +++ b/curl/prj/build.lst @@ -1,3 +1,3 @@ -xc curl : external NULL +xc curl : stlport external NULL xc curl usr1 - all xc_mkout NULL xc curl nmake - all xc_curl NULL |