diff options
| author | Thorsten Behrens <tbehrens@novell.com> | 2011-09-26 23:27:57 +0200 |
|---|---|---|
| committer | Thorsten Behrens <tbehrens@novell.com> | 2011-09-27 09:46:38 +0200 |
| commit | 04b8b4fbbb4b7f72f33d0b76b86945cb98c4ecd9 (patch) | |
| tree | a9038a8c5081a246779a6d9b7fbfe0e774af725a /curl/makefile.mk | |
| parent | 47d7d1e987e1caa030c7623767d9dfe3d85eb924 (diff) | |
Make Android cross-build working
In the spirit of 12759f67a36d52a345be6002d7017551e8414c59, change
external lib's config.sub to eat the arm-unknown-linux-androideabi
host os string. Also, permit shared libs again - seems Android can
handle those.
Added dictionaries to cross-build-toolset - idxdict is needed.
Should build up to sfx2 - some residual static lib issues there,
and in raptor.
Diffstat (limited to 'curl/makefile.mk')
| -rw-r--r-- | curl/makefile.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/curl/makefile.mk b/curl/makefile.mk index c2a92e71fe08..862ff2c555ca 100644 --- a/curl/makefile.mk +++ b/curl/makefile.mk @@ -94,10 +94,10 @@ BUILD_DIR=$(CONFIGURE_DIR)$/lib BUILD_ACTION=$(GNUMAKE) BUILD_FLAGS+= -j$(EXTMAXPROCESS) -.IF "$(OS)"=="IOS" || "$(OS)"=="ANDROID" +.IF "$(OS)"=="IOS" OUT2LIB=$(BUILD_DIR)$/.libs$/libcurl.a .ELSE -OUT2LIB=$(BUILD_DIR)$/.libs$/libcurl$(DLLPOST).4 +OUT2LIB=$(BUILD_DIR)$/.libs$/libcurl$(DLLPOST).? .ENDIF .ENDIF # "$(GUI)"=="UNX" |