diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2008-06-16 13:39:37 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2008-06-16 13:39:37 +0000 |
| commit | d2f5c4b5a5eb45dc19c0b3d8ad88523289218e44 (patch) | |
| tree | 568e6cae1e64cc5c99c083a8244eb1429c0cf4ff /curl | |
| parent | 37617f180e6e1579e965cb98f7d233d40cd41994 (diff) | |
INTEGRATION: CWS hr51 (1.24.4); FILE MERGED
2008/06/06 15:06:57 hr 1.24.4.1: #i88947#: Solaris 64 bit support
Diffstat (limited to 'curl')
| -rw-r--r-- | curl/makefile.mk | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/curl/makefile.mk b/curl/makefile.mk index 19ddd4b49b52..d8c281bf7902 100644 --- a/curl/makefile.mk +++ b/curl/makefile.mk @@ -8,7 +8,7 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.24 $ +# $Revision: 1.25 $ # # This file is part of OpenOffice.org. # @@ -63,6 +63,11 @@ curl_LDFLAGS+=-L$(SYSBASE)$/usr$/lib curl_LDFLAGS+=-Wl,-z,noexecstack .ENDIF +.IF "$(OS)$(CPU)"=="SOLARISU" +curl_CFLAGS+:=$(ARCH_FLAGS) +curl_LDFLAGS+:=$(ARCH_FLAGS) +.ENDIF + CONFIGURE_DIR=.$/ #relative to CONFIGURE_DIR CONFIGURE_ACTION=.$/configure |