Skip to content

Commit 020adbb

Browse files
stevengjtkelman
authored andcommitted
as discussed in #8734, since we rename the openblas symbols we also need to rename the library to avoid conflicts
(cherry picked from commit b0bc951) ref #13407
1 parent 6be2c57 commit 020adbb

File tree

2 files changed

+10
-6
lines changed

2 files changed

+10
-6
lines changed

Make.inc

+4
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
# OPENBLAS build options
88
OPENBLAS_TARGET_ARCH=
99
OPENBLAS_SYMBOLSUFFIX=
10+
OPENBLAS_LIBNAMESUFFIX=
1011

1112
# If OPENBLAS_TARGET_ARCH is set, we default to disabling OPENBLAS_DYNAMIC_ARCH
1213
ifneq ($(OPENBLAS_TARGET_ARCH),)
@@ -836,6 +837,9 @@ endif
836837
ifeq ($(USE_SYSTEM_BLAS), 0)
837838
ifeq ($(USE_BLAS64), 1)
838839
OPENBLAS_SYMBOLSUFFIX = 64_
840+
OPENBLAS_LIBNAMESUFFIX = 64_
841+
LIBBLASNAME = $(LIBBLASNAME)$(OPENBLAS_LIBNAMESUFFIX)
842+
LIBLAPACKNAME = $(LIBBLASNAME)
839843
endif
840844
endif
841845

deps/Makefile

+6-6
Original file line numberDiff line numberDiff line change
@@ -1013,10 +1013,10 @@ install-objconv: $(OBJCONV_TARGET)
10131013
# LAPACK is built into OpenBLAS by default
10141014
OPENBLAS_GIT_URL = git://github.com/xianyi/OpenBLAS.git
10151015
OPENBLAS_TAR_URL = https://api.github.com/repos/xianyi/OpenBLAS/tarball/$1
1016-
$(eval $(call git-external,openblas,OPENBLAS,Makefile,libopenblas.$(SHLIB_EXT)))
1016+
$(eval $(call git-external,openblas,OPENBLAS,Makefile,$(LIBBLASNAME).$(SHLIB_EXT)))
10171017

1018-
OPENBLAS_OBJ_SOURCE = $(OPENBLAS_SRC_DIR)/libopenblas.$(SHLIB_EXT)
1019-
OPENBLAS_OBJ_TARGET = $(build_shlibdir)/libopenblas.$(SHLIB_EXT)
1018+
OPENBLAS_OBJ_SOURCE = $(OPENBLAS_SRC_DIR)/$(LIBBLASNAME).$(SHLIB_EXT)
1019+
OPENBLAS_OBJ_TARGET = $(build_shlibdir)/$(LIBBLASNAME).$(SHLIB_EXT)
10201020
OPENBLAS_BUILD_OPTS = CC="$(CC)" FC="$(FC)" RANLIB="$(RANLIB)" FFLAGS="$(FFLAGS) $(JFFLAGS)" TARGET=$(OPENBLAS_TARGET_ARCH) BINARY=$(BINARY)
10211021

10221022
# Thread support
@@ -1052,7 +1052,7 @@ endif
10521052

10531053
# 64-bit BLAS interface
10541054
ifeq ($(USE_BLAS64), 1)
1055-
OPENBLAS_BUILD_OPTS += INTERFACE64=1 SYMBOLSUFFIX="$(OPENBLAS_SYMBOLSUFFIX)"
1055+
OPENBLAS_BUILD_OPTS += INTERFACE64=1 SYMBOLSUFFIX="$(OPENBLAS_SYMBOLSUFFIX)" LIBPREFIX="$(LIBBLASNAME)"
10561056
ifeq ($(OS), Darwin)
10571057
OPENBLAS_BUILD_OPTS += OBJCONV=$(JULIAHOME)/deps/objconv/objconv
10581058
$(OPENBLAS_OBJ_SOURCE): $(OBJCONV_SOURCE)
@@ -1093,9 +1093,9 @@ $(OPENBLAS_OBJ_TARGET): $(OPENBLAS_OBJ_SOURCE) | $(build_shlibdir)
10931093
cp -f $(OPENBLAS_SRC_DIR)/libopenblas.$(SHLIB_EXT) $(build_shlibdir)
10941094
ifeq ($(OS), Linux)
10951095
cd $(build_shlibdir) && \
1096-
ln -sf libopenblas.$(SHLIB_EXT) libopenblas.$(SHLIB_EXT).0
1096+
ln -sf $(LIBBLASNAME).$(SHLIB_EXT) $(LIBBLASNAME).$(SHLIB_EXT).0
10971097
endif
1098-
$(INSTALL_NAME_CMD)libopenblas.$(SHLIB_EXT) $(build_shlibdir)/libopenblas.$(SHLIB_EXT)
1098+
$(INSTALL_NAME_CMD)$(LIBBLASNAME).$(SHLIB_EXT) $(build_shlibdir)/$(LIBBLASNAME).$(SHLIB_EXT)
10991099

11001100
clean-openblas:
11011101
-$(MAKE) -C $(OPENBLAS_SRC_DIR) clean

0 commit comments

Comments
 (0)