aegaeg

JuliaLang · Dec 28, 2018 · 000d7c7 · 000d7c7
1 parent 6fa8ed8
commit 000d7c7
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 13 deletions.
diff --git a/deps/blas.mk b/deps/blas.mk
@@ -200,8 +200,8 @@ check-lapack: $(BUILDDIR)/lapack-$(LAPACK_VER)/build-checked
 else # USE_BINARYBUILDER_OPENBLAS
 
 
-OPENBLAS_BB_URL_BASE := https://github.com/JuliaLinearAlgebra/OpenBLASBuilder/releases/download
-OPENBLAS_BB_NAME := OpenBLAS.v$(OPENBLAS_VER)
+OPENBLAS_BB_URL_BASE := https://github.com/JuliaPackaging/Yggdrasil/releases/download/OpenBLAS-v$(OPENBLAS_VER)-$(OPENBLAS_BB_REL)
+OPENBLAS_BB_NAME := OpenBLAS.v$(OPENBLAS_VER)-$(OPENBLAS_BB_REL)
 
 $(eval $(call bb-install,openblas,OPENBLAS,true))
 get-lapack: get-openblas

diff --git a/deps/llvm.mk b/deps/llvm.mk
@@ -513,13 +513,12 @@ ifeq ($(USE_POLLY),1)
 endif
 endif
 else # USE_BINARYBUILDER_LLVM
-LLVM_BB_URL_BASE := https://github.com/staticfloat/LLVMBuilder/releases/download
+LLVM_BB_URL_BASE := https://github.com/staticfloat/LLVMBuilder/releases/download/v$(LLVM_VER)-$(LLVM_BB_REL)
 ifneq ($(BINARYBUILDER_LLVM_ASSERTS), 1)
-LLVM_BB_NAME := LLVM
+LLVM_BB_NAME := LLVM.v$(LLVM_VER)
 else
-LLVM_BB_NAME := LLVM.asserts
+LLVM_BB_NAME := LLVM.asserts.v$(LLVM_VER)
 endif
-LLVM_BB_NAME := $(LLVM_BB_NAME).v$(LLVM_VER)
 
 $(eval $(call bb-install,llvm,LLVM,false))
 endif # USE_BINARYBUILDER_LLVM
diff --git a/deps/tools/bb-install.mk b/deps/tools/bb-install.mk
@@ -5,26 +5,26 @@ $(2)_BB_TRIPLET := $(shell python $(call cygpath_w,$(JULIAHOME)/contrib/normaliz
 else
 $(2)_BB_TRIPLET := $(shell python $(call cygpath_w,$(JULIAHOME)/contrib/normalize_triplet.py) $(or $(XC_HOST),$(XC_HOST),$(BUILD_MACHINE)))
 endif
-$(2)_BB_URL := $$($(2)_BB_URL_BASE)/v$$($(2)_VER)-$($(2)_BB_REL)/$$($(2)_BB_NAME).$$($(2)_BB_TRIPLET).tar.gz
+$(2)_BB_URL := $$($(2)_BB_URL_BASE)/$$($(2)_BB_NAME).$$($(2)_BB_TRIPLET).tar.gz
 
-$$(BUILDDIR)/$(1)-$$($(2)_VER)-$$($(2)_BB_REL):
+$$(BUILDDIR)/$(1)-$$($(2)_BB_NAME):
 	mkdir -p $$@
 
-$$(BUILDDIR)/$(1)-$$($(2)_VER)-$$($(2)_BB_REL)/$(2).$$($(2)_BB_TRIPLET).tar.gz: | $$(BUILDDIR)/$(1)-$$($(2)_VER)-$$($(2)_BB_REL)
+$$(BUILDDIR)/$(1)-$$($(2)_BB_NAME)/$(2).$$($(2)_BB_TRIPLET).tar.gz: | $$(BUILDDIR)/$(1)-$$($(2)_BB_NAME)
 	$$(JLDOWNLOAD) $$@ $$($(2)_BB_URL)
 
-$$(BUILDDIR)/$(1)-$$($(2)_VER)-$$($(2)_BB_REL)/build-compiled: | $$(BUILDDIR)/$(1)-$$($(2)_VER)-$$($(2)_BB_REL)/$(2).$$($(2)_BB_TRIPLET).tar.gz
+$$(BUILDDIR)/$(1)-$$($(2)_BB_NAME)/build-compiled: | $$(BUILDDIR)/$(1)-$$($(2)_BB_NAME)/$(2).$$($(2)_BB_TRIPLET).tar.gz
 	echo 1 > $$@
 
-$$(eval $$(call staged-install,$(1),$(1)-$$$$($(2)_VER)-$$$$($(2)_BB_REL),,,,))
+$$(eval $$(call staged-install,$(1),$(1)-$$$$($(2)_BB_NAME),,,,))
 
 #Override provision of stage tarball
-$$(build_staging)/$(1)-$$($(2)_VER)-$$($(2)_BB_REL).tgz: $$(BUILDDIR)/$(1)-$$($(2)_VER)-$$($(2)_BB_REL)/$(2).$$($(2)_BB_TRIPLET).tar.gz | $$(build_staging)
+$$(build_staging)/$(1)-$$($(2)_BB_NAME).tgz: $$(BUILDDIR)/$(1)-$$($(2)_BB_NAME)/$(2).$$($(2)_BB_TRIPLET).tar.gz | $$(build_staging)
 	cp $$< $$@
 
 clean-$(1):
 distclean-$(1):
-get-$(1): $$(BUILDDIR)/$(1)-$$($(2)_VER)-$$($(2)_BB_REL)/$(2).$$($(2)_BB_TRIPLET).tar.gz
+get-$(1): $$(BUILDDIR)/$(1)-$$($(2)_BB_NAME)/$(2).$$($(2)_BB_TRIPLET).tar.gz
 extract-$(1):
 configure-$(1):
 compile-$(1):