default to lib$(SYMBOLPREFIX)openblas$(SYMBOLSUFFIX), as discussed in O…

…penMathLib#646: if you rename the symbols, it is best to rename the library
stevengj · Oct 1, 2015 · 88bef3b · 88bef3b
1 parent f27942a
commit 88bef3b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/Makefile.rule b/Makefile.rule
@@ -169,6 +169,9 @@ COMMON_PROF = -pg
 # 64 bit integer interfaces in OpenBLAS.
 # For details, https://github.com/xianyi/OpenBLAS/pull/459
 #
+# The same prefix and suffix are also added to the library name,
+# i.e. you get lib$(SYMBOLPREFIX)openblas$(SYMBOLSUFFIX) rather than libopenblas
+#
 # SYMBOLPREFIX=
 # SYMBOLSUFFIX=
 

diff --git a/Makefile.system b/Makefile.system
@@ -880,12 +880,6 @@ ifdef USE_SIMPLE_THREADED_LEVEL3
 CCOMMON_OPT	+= -DUSE_SIMPLE_THREADED_LEVEL3
 endif
 
-ifndef LIBNAMESUFFIX
-LIBPREFIX = libopenblas
-else
-LIBPREFIX = libopenblas_$(LIBNAMESUFFIX)
-endif
-
 ifndef SYMBOLPREFIX
 SYMBOLPREFIX =
 endif
@@ -894,6 +888,12 @@ ifndef SYMBOLSUFFIX
 SYMBOLSUFFIX =
 endif
 
+ifndef LIBNAMESUFFIX
+LIBPREFIX = lib$(SYMBOLPREFIX)openblas$(SYMBOLSUFFIX)
+else
+LIBPREFIX = lib$(SYMBOLPREFIX)openblas$(SYMBOLSUFFIX)_$(LIBNAMESUFFIX)
+endif
+
 KERNELDIR	= $(TOPDIR)/kernel/$(ARCH)
 
 include $(TOPDIR)/Makefile.$(ARCH)