Skip to content

Commit b89d976

Browse files
committed
Change install_name on osx to match linux
1 parent 08dedf4 commit b89d976

File tree

3 files changed

+9
-3
lines changed

3 files changed

+9
-3
lines changed

Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,7 @@ endif
109109
ifeq ($(OSNAME), Darwin)
110110
@$(MAKE) -C exports dyn
111111
@ln -fs $(LIBDYNNAME) $(LIBPREFIX).dylib
112+
@ln -fs $(LIBDYNNAME) $(LIBPREFIX).$(MAJOR_VERSION).dylib
112113
endif
113114
ifeq ($(OSNAME), WINNT)
114115
@$(MAKE) -C exports dll

Makefile.install

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,8 @@ ifeq ($(OSNAME), Darwin)
8383
@-cp $(LIBDYNNAME) "$(DESTDIR)$(OPENBLAS_LIBRARY_DIR)"
8484
@-install_name_tool -id "$(DESTDIR)$(OPENBLAS_LIBRARY_DIR)/$(LIBDYNNAME)" "$(DESTDIR)$(OPENBLAS_LIBRARY_DIR)/$(LIBDYNNAME)"
8585
@cd "$(DESTDIR)$(OPENBLAS_LIBRARY_DIR)" ; \
86-
ln -fs $(LIBDYNNAME) $(LIBPREFIX).dylib
86+
ln -fs $(LIBDYNNAME) $(LIBPREFIX).dylib ; \
87+
ln -fs $(LIBDYNNAME) $(LIBPREFIX).$(MAJOR_VERSION).dylib
8788
endif
8889
ifeq ($(OSNAME), WINNT)
8990
@-cp $(LIBDLLNAME) "$(DESTDIR)$(OPENBLAS_BINARY_DIR)"

exports/Makefile

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,10 @@ $(LIBPREFIX).def : gensymbol
105105
libgoto_hpl.def : gensymbol
106106
perl ./gensymbol win2khpl $(ARCH) dummy $(EXPRECISION) $(NO_CBLAS) $(NO_LAPACK) $(NO_LAPACKE) $(NEED2UNDERSCORES) $(ONLY_CBLAS) "$(SYMBOLPREFIX)" "$(SYMBOLSUFFIX)" $(BUILD_LAPACK_DEPRECATED) > $(@F)
107107

108+
ifeq ($(OSNAME), Darwin)
109+
INTERNALNAME = $(LIBPREFIX).$(MAJOR_VERSION).dylib
110+
endif
111+
108112
ifeq (, $(SYMBOLPREFIX)$(SYMBOLSUFFIX))
109113
$(LIBDYNNAME) : ../$(LIBNAME) osx.def
110114
else
@@ -114,9 +118,9 @@ $(LIBDYNNAME) : ../$(LIBNAME).osx.renamed osx.def
114118
endif
115119
ifneq (,$(filter 1 2,$(NOFORTRAN)))
116120
#only build without Fortran
117-
$(CC) $(CFLAGS) $(LDFLAGS) -all_load -headerpad_max_install_names -install_name "$(CURDIR)/../$(LIBDYNNAME)" -dynamiclib -o ../$(LIBDYNNAME) $< -Wl,-exported_symbols_list,osx.def $(FEXTRALIB)
121+
$(CC) $(CFLAGS) $(LDFLAGS) -all_load -headerpad_max_install_names -install_name "$(CURDIR)/../$(INTERNALNAME)" -dynamiclib -o ../$(LIBDYNNAME) $< -Wl,-exported_symbols_list,osx.def $(FEXTRALIB)
118122
else
119-
$(FC) $(FFLAGS) $(LDFLAGS) -all_load -headerpad_max_install_names -install_name "$(CURDIR)/../$(LIBDYNNAME)" -dynamiclib -o ../$(LIBDYNNAME) $< -Wl,-exported_symbols_list,osx.def $(FEXTRALIB)
123+
$(FC) $(FFLAGS) $(LDFLAGS) -all_load -headerpad_max_install_names -install_name "$(CURDIR)/../$(INTERNALNAME)" -dynamiclib -o ../$(LIBDYNNAME) $< -Wl,-exported_symbols_list,osx.def $(FEXTRALIB)
120124
endif
121125

122126
dllinit.$(SUFFIX) : dllinit.c

0 commit comments

Comments
 (0)