summaryrefslogtreecommitdiff
path: root/curl
diff options
context:
space:
mode:
authorTor Lillqvist <tml@iki.fi>2012-09-14 14:15:55 +0300
committerTor Lillqvist <tlillqvist@suse.com>2012-09-14 14:23:45 +0300
commit711fcb41c5adcab3b726624b01834c54398e601e (patch)
tree96fbc2e5a7518b1fba34807a3a4a7be58c808207 /curl
parent0cae0cc42864b6f491b048d63eba230da18943d5 (diff)
Adapt for DISABLE_DYNLOADING instead of just iOS
Change-Id: I26bc5d87725eb9ae00387e42e9a65ed26a8ec168
Diffstat (limited to 'curl')
-rw-r--r--curl/makefile.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/curl/makefile.mk b/curl/makefile.mk
index 56775d125379..d3da8b318b7c 100644
--- a/curl/makefile.mk
+++ b/curl/makefile.mk
@@ -83,7 +83,7 @@ curl_LDFLAGS+:=$(LINKFLAGS) $(LINKFLAGSRUNPATH_OOO)
CONFIGURE_DIR=.$/
#relative to CONFIGURE_DIR
CONFIGURE_ACTION=.$/configure
-.IF "$(OS)"=="IOS"
+.IF "$(DISABLE_DYNLOADING)" == "TRUE"
CONFIGURE_FLAGS=--disable-shared
.ELSE
CONFIGURE_FLAGS=--disable-static
@@ -106,7 +106,7 @@ BUILD_DIR=$(CONFIGURE_DIR)$/lib
BUILD_ACTION=$(GNUMAKE)
BUILD_FLAGS+= -j$(EXTMAXPROCESS)
-.IF "$(OS)"=="IOS"
+.IF "$(DISABLE_DYNLOADING)" == "TRUE"
OUT2LIB=$(BUILD_DIR)$/.libs$/libcurl.a
.ELIF "$(OS)"=="ANDROID"
OUT2LIB=$(BUILD_DIR)$/.libs$/libcurl.so