Skip to content

Commit

Permalink
Fix USE_BINARYBUILDER_OPENBLAS=0 on macOS (#42538)
Browse files Browse the repository at this point in the history
* 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 #42519

* Also update path to `objconv` binary

(cherry picked from commit 6af7584)
  • Loading branch information
staticfloat authored and KristofferC committed May 23, 2022
1 parent 976d31b commit 03f95b6
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions deps/blas.mk
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,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

Expand Down

0 comments on commit 03f95b6

Please sign in to comment.