Merge pull request ocaml#3222 from OCamlPro/libext-cache

make lib-ext: fix curl call and cache URL
OCamlPro · Feb 15, 2018 · c97e68c · c97e68c
2 parents 433e317 + 5e6b0ff
commit c97e68c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/shell/bootstrap-ocaml.sh b/shell/bootstrap-ocaml.sh
@@ -3,7 +3,7 @@
 GEN_CONFIG_ONLY=${GEN_CONFIG_ONLY:-0}
 
 if command -v curl > /dev/null; then
-  CURL="curl -OLSs"
+  CURL="curl -OLSfs"
 elif command -v wget > /dev/null; then
   CURL=wget
 else

diff --git a/src_ext/Makefile b/src_ext/Makefile
@@ -17,7 +17,7 @@ MD5_flexdll = cc456a89382e60d84130cddd53977486
 
 ifndef FETCH
   ifneq ($(shell command -v curl 2>/dev/null),)
-    FETCH = curl -LSs -o $(2) $(1)
+    FETCH = curl -LSfs -o $(2) $(1)
   else
     FETCH = wget -O $(2) $(1)
   endif
@@ -139,7 +139,7 @@ cache-archives: $(SRC_EXTS:=.cache) $(PKG_EXTS:=.pkgcache) ocaml.cache flexdll.c
 		($(call FETCH,$(URL_PKG_$*),$(notdir $(URL_PKG_$*))) && mv $(notdir $(URL_PKG_$*)) archives/)
 
 define cache_url
-https://opam.ocaml.org/2.0~dev/cache/md5/$(shell echo $(MD5_$(2)$(1)) | cut -c -2)/$(MD5_$(2)$(1))
+https://opam.ocaml.org/2.0/cache/md5/$(shell echo $(MD5_$(2)$(1)) | cut -c -2)/$(MD5_$(2)$(1))
 endef
 
 define get_from_cache