Skip to content

Commit ba85e26

Browse files
committed
as discussed in #8734, since we rename the openblas symbols we also need to rename the library to avoid conflicts
1 parent 966850c commit ba85e26

File tree

2 files changed

+10
-6
lines changed

2 files changed

+10
-6
lines changed

Make.inc

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
# OPENBLAS build options
99
OPENBLAS_TARGET_ARCH:=
1010
OPENBLAS_SYMBOLSUFFIX:=
11+
OPENBLAS_LIBNAMESUFFIX:=
1112

1213
# If OPENBLAS_TARGET_ARCH is set, we default to disabling OPENBLAS_DYNAMIC_ARCH
1314
ifneq ($(OPENBLAS_TARGET_ARCH),)
@@ -914,6 +915,9 @@ endif
914915
ifeq ($(USE_SYSTEM_BLAS), 0)
915916
ifeq ($(USE_BLAS64), 1)
916917
OPENBLAS_SYMBOLSUFFIX := 64_
918+
OPENBLAS_LIBNAMESUFFIX := 64_
919+
LIBBLASNAME := $(LIBBLASNAME)_$(OPENBLAS_LIBNAMESUFFIX)
920+
LIBLAPACKNAME := $(LIBBLASNAME)
917921
endif
918922
endif
919923

deps/Makefile

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1059,10 +1059,10 @@ install-objconv: $(OBJCONV_TARGET)
10591059
# LAPACK is built into OpenBLAS by default
10601060
OPENBLAS_GIT_URL := git://github.com/xianyi/OpenBLAS.git
10611061
OPENBLAS_TAR_URL = https://github.com/api/repos/xianyi/OpenBLAS/tarball/$1
1062-
$(eval $(call git-external,openblas,OPENBLAS,Makefile,libopenblas.$(SHLIB_EXT),$(BUILDDIR)))
1062+
$(eval $(call git-external,openblas,OPENBLAS,Makefile,$(LIBBLASNAME).$(SHLIB_EXT),$(BUILDDIR)))
10631063

1064-
OPENBLAS_OBJ_SOURCE := $(BUILDDIR)/$(OPENBLAS_SRC_DIR)/libopenblas.$(SHLIB_EXT)
1065-
OPENBLAS_OBJ_TARGET := $(build_shlibdir)/libopenblas.$(SHLIB_EXT)
1064+
OPENBLAS_OBJ_SOURCE := $(BUILDDIR)/$(OPENBLAS_SRC_DIR)/$(LIBBLASNAME).$(SHLIB_EXT)
1065+
OPENBLAS_OBJ_TARGET := $(build_shlibdir)/$(LIBBLASNAME).$(SHLIB_EXT)
10661066
OPENBLAS_BUILD_OPTS := CC="$(CC)" FC="$(FC)" RANLIB="$(RANLIB)" FFLAGS="$(FFLAGS) $(JFFLAGS)" TARGET=$(OPENBLAS_TARGET_ARCH) BINARY=$(BINARY)
10671067

10681068
# Thread support
@@ -1098,7 +1098,7 @@ endif
10981098

10991099
# 64-bit BLAS interface
11001100
ifeq ($(USE_BLAS64), 1)
1101-
OPENBLAS_BUILD_OPTS += INTERFACE64=1 SYMBOLSUFFIX="$(OPENBLAS_SYMBOLSUFFIX)"
1101+
OPENBLAS_BUILD_OPTS += INTERFACE64=1 SYMBOLSUFFIX="$(OPENBLAS_SYMBOLSUFFIX)" LIBNAMESUFFIX="$(OPENBLAS_LIBNAMESUFFIX)"
11021102
ifeq ($(OS), Darwin)
11031103
OPENBLAS_BUILD_OPTS += OBJCONV=$(abspath $(BUILDDIR)/objconv/objconv)
11041104
$(OPENBLAS_OBJ_SOURCE): $(OBJCONV_SOURCE)
@@ -1139,9 +1139,9 @@ $(OPENBLAS_OBJ_TARGET): $(OPENBLAS_OBJ_SOURCE) | $(build_shlibdir)
11391139
cp -f $< $@
11401140
ifeq ($(OS), Linux)
11411141
cd $(dir $@) && \
1142-
ln -sf libopenblas.$(SHLIB_EXT) libopenblas.$(SHLIB_EXT).0
1142+
ln -sf $(LIBBLASNAME).$(SHLIB_EXT) $(LIBBLASNAME).$(SHLIB_EXT).0
11431143
endif
1144-
$(INSTALL_NAME_CMD)libopenblas.$(SHLIB_EXT) $@
1144+
$(INSTALL_NAME_CMD)$(LIBBLASNAME).$(SHLIB_EXT) $@
11451145

11461146
clean-openblas:
11471147
-$(MAKE) -C $(BUILDDIR)/$(OPENBLAS_SRC_DIR) clean

0 commit comments

Comments
 (0)