From f2a029b5b74ee847eac130627cfd33010193fde6 Mon Sep 17 00:00:00 2001 From: Elliot Saba Date: Sat, 16 Oct 2021 09:17:36 -0700 Subject: [PATCH] Fix USE_BINARYBUILDER_OPENBLAS=0 on macOS (#42538) * 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 * Also update path to `objconv` binary --- deps/openblas.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/deps/openblas.mk b/deps/openblas.mk index 19fcee1102df51..7cd1715ef7daca 100644 --- a/deps/openblas.mk +++ b/deps/openblas.mk @@ -29,8 +29,8 @@ 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) -$(BUILDDIR)/$(OPENBLAS_SRC_DIR)/build-compiled: | $(BUILDDIR)/objconv/build-compiled +OPENBLAS_BUILD_OPTS += OBJCONV=$(abspath $(build_bindir)/objconv) +$(BUILDDIR)/$(OPENBLAS_SRC_DIR)/build-compiled: | $(build_prefix)/manifest/objconv endif endif