diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-06-05 14:06:39 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2015-06-05 14:33:38 +0200 |
| commit | 81ae40bfe35fd55db789d75d1698f186f13402dd (patch) | |
| tree | 694f362961249db04505800156f0d2d27e2260ce /external | |
| parent | 2f437f5a1003d9593b7e1d35fb31c2bd34c58151 (diff) | |
liborcus: still build statically on Android
Change-Id: Ieeb5180ea7f96cb08d06bf895bd2a6ffc6c1cef0
(cherry picked from commit 0aed9cbb6c6e8e048a90fed61f44efbe09efac4f)
Signed-off-by: David Tardon <dtardon@redhat.com>
Diffstat (limited to 'external')
| -rw-r--r-- | external/liborcus/ExternalProject_liborcus.mk | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/external/liborcus/ExternalProject_liborcus.mk b/external/liborcus/ExternalProject_liborcus.mk index ff488bf70cc1..2193fa987c9f 100644 --- a/external/liborcus/ExternalProject_liborcus.mk +++ b/external/liborcus/ExternalProject_liborcus.mk @@ -87,8 +87,7 @@ $(call gb_ExternalProject_get_state_target,liborcus,build) : MDDS_LIBS=' ' \ MAKE=$(MAKE) ./configure \ --with-pic \ - --enable-shared \ - --disable-static \ + $(if $(filter IOS ANDROID,$(OS)), --disable-shared --enable-static, --enable-shared --disable-static) \ $(if $(ENABLE_DEBUG),--enable-debug,--disable-debug) \ --disable-spreadsheet-model \ --without-tools \ |