Skip to content

Commit 1c3e2d3

Browse files
authored
Merge pull request #1293 from embray/cygwin/install
More canonical installation on Cygwin
2 parents f66d908 + dddedba commit 1c3e2d3

File tree

3 files changed

+15
-7
lines changed

3 files changed

+15
-7
lines changed

Makefile.install

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,10 +90,11 @@ ifeq ($(OSNAME), Darwin)
9090
endif
9191
ifeq ($(OSNAME), WINNT)
9292
@-cp $(LIBDLLNAME) "$(DESTDIR)$(OPENBLAS_BINARY_DIR)"
93-
@-cp $(LIBDLLNAME).a "$(DESTDIR)$(OPENBLAS_LIBRARY_DIR)"
93+
@-cp $(IMPLIBNAME) "$(DESTDIR)$(OPENBLAS_LIBRARY_DIR)"
9494
endif
9595
ifeq ($(OSNAME), CYGWIN_NT)
9696
@-cp $(LIBDLLNAME) "$(DESTDIR)$(OPENBLAS_BINARY_DIR)"
97+
@-cp $(IMPLIBNAME) "$(DESTDIR)$(OPENBLAS_LIBRARY_DIR)"
9798
endif
9899
endif
99100

Makefile.system

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -944,9 +944,15 @@ SYMBOLSUFFIX =
944944
endif
945945

946946
ifndef LIBNAMESUFFIX
947-
LIBPREFIX = lib$(SYMBOLPREFIX)openblas$(SYMBOLSUFFIX)
947+
LIBNAMEBASE = $(SYMBOLPREFIX)openblas$(SYMBOLSUFFIX)
948948
else
949-
LIBPREFIX = lib$(SYMBOLPREFIX)openblas$(SYMBOLSUFFIX)_$(LIBNAMESUFFIX)
949+
LIBNAMEBASE = $(SYMBOLPREFIX)openblas$(SYMBOLSUFFIX)_$(LIBNAMESUFFIX)
950+
endif
951+
952+
ifeq ($(OSNAME), CYGWIN_NT)
953+
LIBPREFIX = cyg$(LIBNAMEBASE)
954+
else
955+
LIBPREFIX = lib$(LIBNAMEBASE)
950956
endif
951957

952958
KERNELDIR = $(TOPDIR)/kernel/$(ARCH)
@@ -1105,6 +1111,7 @@ endif
11051111

11061112

11071113
LIBDLLNAME = $(LIBPREFIX).dll
1114+
IMPLIBNAME = lib$(LIBNAMEBASE).dll.a
11081115
LIBSONAME = $(LIBNAME:.$(LIBSUFFIX)=.so)
11091116
LIBDYNNAME = $(LIBNAME:.$(LIBSUFFIX)=.dylib)
11101117
LIBDEFNAME = $(LIBNAME:.$(LIBSUFFIX)=.def)

exports/Makefile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -89,13 +89,13 @@ dll : ../$(LIBDLLNAME)
8989
# in their import table. By instead using a stable name it is possible to
9090
# upgrade between library versions, without needing to re-link an application.
9191
# For more details see: https://github.com/xianyi/OpenBLAS/issues/127.
92-
../$(LIBDLLNAME) : ../$(LIBNAME) libopenblas.def dllinit.$(SUFFIX)
92+
../$(LIBDLLNAME) : ../$(LIBNAME) $(LIBPREFIX).def dllinit.$(SUFFIX)
9393
$(RANLIB) ../$(LIBNAME)
94-
$(CC) $(CFLAGS) $(LDFLAGS) libopenblas.def dllinit.$(SUFFIX) \
95-
-shared -o ../$(LIBDLLNAME) -Wl,--out-implib,../$(LIBDLLNAME).a \
94+
$(CC) $(CFLAGS) $(LDFLAGS) $(LIBPREFIX).def dllinit.$(SUFFIX) \
95+
-shared -o ../$(LIBDLLNAME) -Wl,--out-implib,../$(IMPLIBNAME) \
9696
-Wl,--whole-archive ../$(LIBNAME) -Wl,--no-whole-archive $(FEXTRALIB) $(EXTRALIB)
9797

98-
libopenblas.def : gensymbol
98+
$(LIBPREFIX).def : gensymbol
9999
perl ./gensymbol win2k $(ARCH) dummy $(EXPRECISION) $(NO_CBLAS) $(NO_LAPACK) $(NO_LAPACKE) $(NEED2UNDERSCORES) $(ONLY_CBLAS) "$(SYMBOLPREFIX)" "$(SYMBOLSUFFIX)" $(BUILD_LAPACK_DEPRECATED) > $(@F)
100100

101101
libgoto_hpl.def : gensymbol

0 commit comments

Comments
 (0)