Run $(INSTALL_NAME_CMD) on libblastrampoline in full source build.

JuliaLang · Jun 19, 2022 · 6089df9 · 6089df9
1 parent 3efc725
commit 6089df9
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/deps/blastrampoline.mk b/deps/blastrampoline.mk
@@ -8,6 +8,7 @@ $(eval $(call git-external,blastrampoline,BLASTRAMPOLINE,,,$(BUILDDIR)))
 
 $(BUILDDIR)/$(BLASTRAMPOLINE_SRC_DIR)/build-configured: $(BUILDDIR)/$(BLASTRAMPOLINE_SRC_DIR)/source-extracted
 	mkdir -p $(dir $@)
+	$(INSTALL_NAME_CMD)libblastrampoline.$(SHLIB_EXT) $(dir $<)lib/libblastrampoline.$(SHLIB_EXT) || exit 1;
 	echo 1 > $@
 
 $(BUILDDIR)/$(BLASTRAMPOLINE_SRC_DIR)/build-compiled: $(BUILDDIR)/$(BLASTRAMPOLINE_SRC_DIR)/build-configured

diff --git a/deps/libsuitesparse.mk b/deps/libsuitesparse.mk
@@ -17,13 +17,18 @@ ifneq ($(USE_BINARYBUILDER_LIBSUITESPARSE), 1)
 LIBSUITESPARSE_PROJECTS := AMD BTF CAMD CCOLAMD COLAMD CHOLMOD LDL KLU UMFPACK RBio SPQR
 LIBSUITESPARSE_LIBS := $(addsuffix .*$(SHLIB_EXT)*,suitesparseconfig amd btf camd ccolamd colamd cholmod klu ldl umfpack rbio spqr)
 
-SUITE_SPARSE_LIB := $(LDFLAGS) -L"$(abspath $(BUILDDIR))/SuiteSparse-$(LIBSUITESPARSE_VER)/lib"
+SUITESPARSE_LIB := $(LDFLAGS) -L"$(abspath $(BUILDDIR))/SuiteSparse-$(LIBSUITESPARSE_VER)/lib"
 ifeq ($(OS), Darwin)
-SUITE_SPARSE_LIB += $(RPATH_ESCAPED_ORIGIN)
+SUITESPARSE_LIB += $(RPATH_ESCAPED_ORIGIN)
 endif
-LIBSUITESPARSE_MFLAGS := CC="$(CC)" CXX="$(CXX)" F77="$(FC)" AR="$(AR)" RANLIB="$(RANLIB)" BLAS="-L$(build_shlibdir) -lblastrampoline" LAPACK="-L$(build_shlibdir) -lblastrampoline" \
-	  LDFLAGS="$(SUITE_SPARSE_LIB)" CFOPENMP="" CUDA=no CUDA_PATH="" \
-	  UMFPACK_CONFIG="$(UMFPACK_CONFIG)" CHOLMOD_CONFIG="$(CHOLMOD_CONFIG)" SPQR_CONFIG="$(SPQR_CONFIG)"
+LIBSUITESPARSE_MFLAGS := CC="$(CC)" CXX="$(CXX)" F77="$(FC)" \
+	  AR="$(AR)" RANLIB="$(RANLIB)" \
+	  BLAS="-L$(build_shlibdir) -lblastrampoline" \
+	  LAPACK="-L$(build_shlibdir) -lblastrampoline" \
+	  LDFLAGS="$(SUITESPARSE_LIB)" CFOPENMP="" CUDA=no CUDA_PATH="" \
+	  UMFPACK_CONFIG="$(UMFPACK_CONFIG)" \
+	  CHOLMOD_CONFIG="$(CHOLMOD_CONFIG)" \
+	  SPQR_CONFIG="$(SPQR_CONFIG)"
 ifeq ($(OS),WINNT)
 LIBSUITESPARSE_MFLAGS += UNAME=Windows
 else