Skip to content

Commit c666158

Browse files
committed
Merge pull request #656 from stevengj/libname
default to lib$(SYMBOLPREFIX)openblas$(SYMBOLSUFFIX)
2 parents ccf581f + 88bef3b commit c666158

File tree

2 files changed

+9
-6
lines changed

2 files changed

+9
-6
lines changed

Makefile.rule

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -169,6 +169,9 @@ COMMON_PROF = -pg
169169
# 64 bit integer interfaces in OpenBLAS.
170170
# For details, https://github.com/xianyi/OpenBLAS/pull/459
171171
#
172+
# The same prefix and suffix are also added to the library name,
173+
# i.e. you get lib$(SYMBOLPREFIX)openblas$(SYMBOLSUFFIX) rather than libopenblas
174+
#
172175
# SYMBOLPREFIX=
173176
# SYMBOLSUFFIX=
174177

Makefile.system

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -880,12 +880,6 @@ ifdef USE_SIMPLE_THREADED_LEVEL3
880880
CCOMMON_OPT += -DUSE_SIMPLE_THREADED_LEVEL3
881881
endif
882882

883-
ifndef LIBNAMESUFFIX
884-
LIBPREFIX = libopenblas
885-
else
886-
LIBPREFIX = libopenblas_$(LIBNAMESUFFIX)
887-
endif
888-
889883
ifndef SYMBOLPREFIX
890884
SYMBOLPREFIX =
891885
endif
@@ -894,6 +888,12 @@ ifndef SYMBOLSUFFIX
894888
SYMBOLSUFFIX =
895889
endif
896890

891+
ifndef LIBNAMESUFFIX
892+
LIBPREFIX = lib$(SYMBOLPREFIX)openblas$(SYMBOLSUFFIX)
893+
else
894+
LIBPREFIX = lib$(SYMBOLPREFIX)openblas$(SYMBOLSUFFIX)_$(LIBNAMESUFFIX)
895+
endif
896+
897897
KERNELDIR = $(TOPDIR)/kernel/$(ARCH)
898898

899899
include $(TOPDIR)/Makefile.$(ARCH)

0 commit comments

Comments
 (0)