Skip to content

C
core
Kaydet (Commit) 3a6233a0 authored tarafından Cédric Bosdonnat's avatar Cédric Bosdonnat
Dosyalara gözat
Seçenekler

Add PATH to have curl configure find ns{s,pr}-config in solver 

Change-Id: I15dc96c13189d0dc76c616f3ab49d2ea099bc884
üst 1a926112
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 2 deletions
curl/ExternalProject_curl.mk
Dosyayı görüntüle @ 3a6233a0
...@@ -19,7 +19,8 @@ ifeq ($(GUI),UNX) ...@@ -19,7 +19,8 @@ ifeq ($(GUI),UNX)
$(call gb_ExternalProject_get_state_target,curl,build): $(call gb_ExternalProject_get_state_target,curl,build):
cd $(EXTERNAL_WORKDIR) \ 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 \ --disable-file --disable-ldap --disable-telnet --disable-dict --without-libssh2 \
$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ $(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
$(if $(filter TRUE,$(DISABLE_DYNLOADING)),--disable-shared,--disable-static) \ $(if $(filter TRUE,$(DISABLE_DYNLOADING)),--disable-shared,--disable-static) \
...@@ -33,7 +34,7 @@ else ifeq ($(OS)$(COM),WNTGCC) ...@@ -33,7 +34,7 @@ else ifeq ($(OS)$(COM),WNTGCC)
$(call gb_ExternalProject_get_state_target,curl,build): $(call gb_ExternalProject_get_state_target,curl,build):
cd $(EXTERNAL_WORKDIR) \ 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 \ --disable-file --disable-ldap --disable-telnet --disable-dict --build=i586-pc-mingw32 --host=i586-pc-mingw32 \
$(if $(filter TRUE,$(ENABLE_DEBUG)),--enable-debug) \ $(if $(filter TRUE,$(ENABLE_DEBUG)),--enable-debug) \
CC="$(CC) -mthreads $(if $(filter YES,$(MINGW_SHARED_GCCLIB)),-shared-libgcc)" \ CC="$(CC) -mthreads $(if $(filter YES,$(MINGW_SHARED_GCCLIB)),-shared-libgcc)" \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment