summaryrefslogtreecommitdiff
path: root/curl
diff options
context:
space:
mode:
authorCédric Bosdonnat <cedric.bosdonnat@free.fr>2012-10-30 13:38:51 +0100
committerCédric Bosdonnat <cedric.bosdonnat@free.fr>2012-10-31 12:03:30 +0100
commit3a6233a0406acda6b9b9611cc0cd5c4e73e3f9c3 (patch)
tree819d2235be59884e5fdf13a22a8a745c5ed5faa9 /curl
parent1a9261124eed5baa04b069a1cb1b51f24423ec9b (diff)
Add PATH to have curl configure find ns{s,pr}-config in solver
Change-Id: I15dc96c13189d0dc76c616f3ab49d2ea099bc884
Diffstat (limited to 'curl')
-rw-r--r--curl/ExternalProject_curl.mk5
1 files changed, 3 insertions, 2 deletions
diff --git a/curl/ExternalProject_curl.mk b/curl/ExternalProject_curl.mk
index 7baca05fd6a4..e1388cdd687d 100644
--- a/curl/ExternalProject_curl.mk
+++ b/curl/ExternalProject_curl.mk
@@ -19,7 +19,8 @@ ifeq ($(GUI),UNX)
$(call gb_ExternalProject_get_state_target,curl,build):
cd $(EXTERNAL_WORKDIR) \
- && ./configure --with-nss --without-ssl --without-libidn --enable-ftp --enable-ipv6 --enable-http --disable-gopher \
+ && PATH=$(OUTDIR_FOR_BUILD)/bin:$$PATH ./configure --with-nss --without-ssl \
+ --without-libidn --enable-ftp --enable-ipv6 --enable-http --disable-gopher \
--disable-file --disable-ldap --disable-telnet --disable-dict --without-libssh2 \
$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
$(if $(filter TRUE,$(DISABLE_DYNLOADING)),--disable-shared,--disable-static) \
@@ -33,7 +34,7 @@ else ifeq ($(OS)$(COM),WNTGCC)
$(call gb_ExternalProject_get_state_target,curl,build):
cd $(EXTERNAL_WORKDIR) \
- && ./configure --with-nss --without-ssl --enable-ftp --enable-ipv6 --disable-http --disable-gopher \
+ && PATH=$(OUTDIR_FOR_BUILD)/bin:$$PATH ./configure --with-nss --without-ssl --enable-ftp --enable-ipv6 --disable-http --disable-gopher \
--disable-file --disable-ldap --disable-telnet --disable-dict --build=i586-pc-mingw32 --host=i586-pc-mingw32 \
$(if $(filter TRUE,$(ENABLE_DEBUG)),--enable-debug) \
CC="$(CC) -mthreads $(if $(filter YES,$(MINGW_SHARED_GCCLIB)),-shared-libgcc)" \