diff options
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 |