Skip to content

Commit b82108f

Browse files
committed
Merge pull request #399 from TimothyGu/upstr
Build import libs as .dll.a instead of .lib
2 parents 8373ad4 + 4ebbf75 commit b82108f

3 files changed

Lines changed: 6 additions & 2 deletions

File tree

.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,10 @@ lapack-netlib/TESTING/testing_results.txt
2121
lib.grd
2222
nohup.out
2323
config.h
24+
config_kernel.h
2425
Makefile.conf
2526
Makefile.conf_last
27+
Makefile_kernel.conf
2628
config_last.h
2729
getarch
2830
getarch_2nd
@@ -41,6 +43,8 @@ ctest/xzcblat2
4143
ctest/xzcblat3
4244
exports/linktest.c
4345
exports/linux.def
46+
kernel/setparam_*.c
47+
kernel/kernel_*.h
4448
test/CBLAT2.SUMM
4549
test/CBLAT3.SUMM
4650
test/DBLAT2.SUMM

Makefile.install

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ ifeq ($(OSNAME), Darwin)
8383
endif
8484
ifeq ($(OSNAME), WINNT)
8585
@-cp $(LIBDLLNAME) $(OPENBLAS_BINARY_DIR)
86-
@-cp $(LIBPREFIX).lib $(OPENBLAS_LIBRARY_DIR)
86+
@-cp $(LIBDLLNAME).a $(OPENBLAS_LIBRARY_DIR)
8787
endif
8888
ifeq ($(OSNAME), CYGWIN_NT)
8989
@-cp $(LIBDLLNAME) $(OPENBLAS_BINARY_DIR)

exports/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ dll : ../$(LIBDLLNAME)
8484
../$(LIBDLLNAME) : ../$(LIBNAME) libopenblas.def dllinit.$(SUFFIX)
8585
$(RANLIB) ../$(LIBNAME)
8686
$(CC) $(CFLAGS) $(LDFLAGS) libopenblas.def dllinit.$(SUFFIX) \
87-
-shared -o ../$(LIBDLLNAME) -Wl,--out-implib,../$(LIBPREFIX).lib \
87+
-shared -o ../$(LIBDLLNAME) -Wl,--out-implib,../$(LIBDLLNAME).a \
8888
-Wl,--whole-archive ../$(LIBNAME) -Wl,--no-whole-archive $(FEXTRALIB) $(EXTRALIB)
8989

9090
libopenblas.def : gensymbol

0 commit comments

Comments
 (0)