external/curl/ExternalProject_curl.mk | 2 ++ 1 file changed, 2 insertions(+)
New commits: commit 5e50987119d4ac6878911ad07e19680cc30384b9 Author: Tor Lillqvist <t...@collabora.com> Date: Wed Oct 30 20:06:18 2013 +0200 Fix build for Android: Don't use SYSBASE that way Change-Id: Ib4027a28a2e4b19842508a6006c1c56a06d021ed diff --git a/external/curl/ExternalProject_curl.mk b/external/curl/ExternalProject_curl.mk index 142a782..4b046fc 100644 --- a/external/curl/ExternalProject_curl.mk +++ b/external/curl/ExternalProject_curl.mk @@ -23,10 +23,12 @@ ifneq ($(OS),WNT) curl_CPPFLAGS := curl_LDFLAGS := $(if $(filter LINUX FREEBSD,$(OS)),"-Wl$(COMMA)-z$(COMMA)origin -Wl$(COMMA)-rpath$(COMMA)\\"\$$\$$ORIGIN:'\'\$$\$$ORIGIN/../ure-link/lib) +ifneq ($(OS),ANDROID) ifneq ($(SYSBASE),) curl_CPPFLAGS += -I$(SYSBASE)/usr/include curl_LDFLAGS += -L$(SYSBASE)/usr/lib endif +endif # there are 2 include paths, the other one is passed to --with-nss below ifeq ($(SYSTEM_NSS),NO) _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits