diff options
| author | Tor Lillqvist <tml@collabora.com> | 2013-10-30 20:06:18 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2013-10-30 20:06:37 +0200 |
| commit | 5e50987119d4ac6878911ad07e19680cc30384b9 (patch) | |
| tree | fe0d453d42c1339dec68b6380c7f58a7a88869da /external/curl | |
| parent | 6461b9c9d28f1f46b6338c768c51a4eeb366ebab (diff) | |
Fix build for Android: Don't use SYSBASE that way
Change-Id: Ib4027a28a2e4b19842508a6006c1c56a06d021ed
Diffstat (limited to 'external/curl')
| -rw-r--r-- | external/curl/ExternalProject_curl.mk | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/external/curl/ExternalProject_curl.mk b/external/curl/ExternalProject_curl.mk index 142a782efcc9..4b046fc5994d 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) |