diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-02-29 09:51:17 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-02-29 09:51:26 +0100 |
| commit | b53d201eab6d087c83f200c1a53fe107aa681db5 (patch) | |
| tree | ecf12b5e2f5bf9777687d8803d0fa9c18a900ed1 | |
| parent | 354b03dee188d35dd932d514b186dcb9171ddaf7 (diff) | |
| parent | fa7a5c54fc836ada12c185c43806c5e4a1044701 (diff) | |
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)
| -rw-r--r-- | depends/builders/darwin.mk | 2 | ||||
| -rw-r--r-- | depends/builders/linux.mk | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/depends/builders/darwin.mk b/depends/builders/darwin.mk index cedbddc578..200d6ed22a 100644 --- a/depends/builders/darwin.mk +++ b/depends/builders/darwin.mk @@ -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) diff --git a/depends/builders/linux.mk b/depends/builders/linux.mk index d6a304e4b4..b03f424010 100644 --- a/depends/builders/linux.mk +++ b/depends/builders/linux.mk @@ -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 |