floraachy
/
OpenBLAS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #399 from TimothyGu/upstr 

Build import libs as .dll.a instead of .lib
This commit is contained in:
Zhang Xianyi 2014-06-28 20:40:23 +08:00
parent 8373ad4ec2 4ebbf758f5
commit b82108f899
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitignore vendored
View File

@ -21,8 +21,10 @@ lapack-netlib/TESTING/testing_results.txt
lib.grd lib.grd
nohup.out nohup.out
config.h config.h
config_kernel.h
Makefile.conf Makefile.conf
Makefile.conf_last Makefile.conf_last
Makefile_kernel.conf
config_last.h config_last.h
getarch getarch
getarch_2nd getarch_2nd
@ -41,6 +43,8 @@ ctest/xzcblat2
ctest/xzcblat3 ctest/xzcblat3
exports/linktest.c exports/linktest.c
exports/linux.def exports/linux.def
kernel/setparam_*.c
kernel/kernel_*.h
test/CBLAT2.SUMM test/CBLAT2.SUMM
test/CBLAT3.SUMM test/CBLAT3.SUMM
test/DBLAT2.SUMM test/DBLAT2.SUMM

2
Makefile.install
View File

@ -83,7 +83,7 @@ ifeq ($(OSNAME), Darwin)
endif endif
ifeq ($(OSNAME), WINNT) ifeq ($(OSNAME), WINNT)
@-cp $(LIBDLLNAME) $(OPENBLAS_BINARY_DIR) @-cp $(LIBDLLNAME) $(OPENBLAS_BINARY_DIR)
@-cp $(LIBPREFIX).lib $(OPENBLAS_LIBRARY_DIR) @-cp $(LIBDLLNAME).a $(OPENBLAS_LIBRARY_DIR)
endif endif
ifeq ($(OSNAME), CYGWIN_NT) ifeq ($(OSNAME), CYGWIN_NT)
@-cp $(LIBDLLNAME) $(OPENBLAS_BINARY_DIR) @-cp $(LIBDLLNAME) $(OPENBLAS_BINARY_DIR)

2
exports/Makefile
View File

@ -84,7 +84,7 @@ dll : ../$(LIBDLLNAME)
../$(LIBDLLNAME) : ../$(LIBNAME) libopenblas.def dllinit.$(SUFFIX) ../$(LIBDLLNAME) : ../$(LIBNAME) libopenblas.def dllinit.$(SUFFIX)
$(RANLIB) ../$(LIBNAME) $(RANLIB) ../$(LIBNAME)
$(CC) $(CFLAGS) $(LDFLAGS) libopenblas.def dllinit.$(SUFFIX) \ $(CC) $(CFLAGS) $(LDFLAGS) libopenblas.def dllinit.$(SUFFIX) \
-shared -o ../$(LIBDLLNAME) -Wl,--out-implib,../$(LIBPREFIX).lib \ -shared -o ../$(LIBDLLNAME) -Wl,--out-implib,../$(LIBDLLNAME).a \
-Wl,--whole-archive ../$(LIBNAME) -Wl,--no-whole-archive $(FEXTRALIB) $(EXTRALIB) -Wl,--whole-archive ../$(LIBNAME) -Wl,--no-whole-archive $(FEXTRALIB) $(EXTRALIB)
libopenblas.def : gensymbol libopenblas.def : gensymbol