From 86695cf2f24cbc55164db0357abb19f5a197482f Mon Sep 17 00:00:00 2001 From: Elliot Saba Date: Thu, 7 Oct 2021 17:08:47 -0400 Subject: [PATCH 1/2] Fix USE_BINARYBUILDER_OPENBLAS=0 on macOS We didn't properly move the OpenBLAS -> Objconv dependency chain over to manifest files. This was not visible until now because we rarely build OpenBLAS from source without also building Objconv from source. Fixes https://github.com/JuliaLang/julia/issues/42519 --- deps/openblas.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deps/openblas.mk b/deps/openblas.mk index 323d44792eebd..396e3ce3660e6 100644 --- a/deps/openblas.mk +++ b/deps/openblas.mk @@ -43,7 +43,7 @@ ifeq ($(USE_BLAS64), 1) OPENBLAS_BUILD_OPTS += INTERFACE64=1 SYMBOLSUFFIX="$(OPENBLAS_SYMBOLSUFFIX)" LIBPREFIX="libopenblas$(OPENBLAS_LIBNAMESUFFIX)" ifeq ($(OS), Darwin) OPENBLAS_BUILD_OPTS += OBJCONV=$(abspath $(BUILDDIR)/objconv/objconv) -$(BUILDDIR)/$(OPENBLAS_SRC_DIR)/build-compiled: | $(BUILDDIR)/objconv/build-compiled +$(BUILDDIR)/$(OPENBLAS_SRC_DIR)/build-compiled: | $(build_prefix)/manifest/objconv endif endif From 830a3a1aa8805170a7595caf515ea64917b1dd9d Mon Sep 17 00:00:00 2001 From: Elliot Saba Date: Thu, 7 Oct 2021 17:33:23 -0400 Subject: [PATCH 2/2] Also update path to `objconv` binary --- deps/openblas.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deps/openblas.mk b/deps/openblas.mk index 396e3ce3660e6..f38f448d3e295 100644 --- a/deps/openblas.mk +++ b/deps/openblas.mk @@ -42,7 +42,7 @@ endif ifeq ($(USE_BLAS64), 1) OPENBLAS_BUILD_OPTS += INTERFACE64=1 SYMBOLSUFFIX="$(OPENBLAS_SYMBOLSUFFIX)" LIBPREFIX="libopenblas$(OPENBLAS_LIBNAMESUFFIX)" ifeq ($(OS), Darwin) -OPENBLAS_BUILD_OPTS += OBJCONV=$(abspath $(BUILDDIR)/objconv/objconv) +OPENBLAS_BUILD_OPTS += OBJCONV=$(abspath $(build_bindir)/objconv) $(BUILDDIR)/$(OPENBLAS_SRC_DIR)/build-compiled: | $(build_prefix)/manifest/objconv endif endif