Browse Source

Merge #7606: [depends] builders: No need to set -L and --location for curl

fa7a5c5 [depends] builders: No need to set -L and --location for curl (MarcoFalke)
0.13
Wladimir J. van der Laan 9 years ago
parent
commit
b53d201eab
No known key found for this signature in database
GPG Key ID: 74810B012346C9A6
  1. 2
      depends/builders/darwin.mk
  2. 2
      depends/builders/linux.mk

2
depends/builders/darwin.mk

@ -7,7 +7,7 @@ build_darwin_OTOOL: = $(shell xcrun -f otool) @@ -7,7 +7,7 @@ build_darwin_OTOOL: = $(shell xcrun -f otool)
build_darwin_NM: = $(shell xcrun -f nm)
build_darwin_INSTALL_NAME_TOOL:=$(shell xcrun -f install_name_tool)
build_darwin_SHA256SUM = shasum -a 256
build_darwin_DOWNLOAD = curl --location --fail --connect-timeout $(DOWNLOAD_CONNECT_TIMEOUT) --retry $(DOWNLOAD_RETRIES) -L -o
build_darwin_DOWNLOAD = curl --location --fail --connect-timeout $(DOWNLOAD_CONNECT_TIMEOUT) --retry $(DOWNLOAD_RETRIES) -o
#darwin host on darwin builder. overrides darwin host preferences.
darwin_CC=$(shell xcrun -f clang) -mmacosx-version-min=$(OSX_MIN_VERSION)

2
depends/builders/linux.mk

@ -1,2 +1,2 @@ @@ -1,2 +1,2 @@
build_linux_SHA256SUM = sha256sum
build_linux_DOWNLOAD = curl --location --fail --connect-timeout $(DOWNLOAD_CONNECT_TIMEOUT) --retry $(DOWNLOAD_RETRIES) -L -o
build_linux_DOWNLOAD = curl --location --fail --connect-timeout $(DOWNLOAD_CONNECT_TIMEOUT) --retry $(DOWNLOAD_RETRIES) -o

Loading…
Cancel
Save