[PATCH 12/14] Rename LIB to LIBPREFIX, and set it to nothing on mingw

Mike Hommey mh+jemalloc at glandium.org
Thu Apr 19 04:03:57 PDT 2012


From: Mike Hommey <mh at glandium.org>

---
 Makefile.in  |    4 ++--
 configure.ac |    5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 151f55f..6caad4e 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -32,7 +32,7 @@ SO := @so@
 O := @o@
 A := @a@
 EXE := @exe@
-LIB := @lib@
+LIBPREFIX := @libprefix@
 REV := @rev@
 install_suffix := @install_suffix@
 ABI := @abi@
@@ -60,7 +60,7 @@ TEST_LIBRARY_PATH :=
 endif
 endif
 
-LIBJEMALLOC := $(LIB)jemalloc$(install_suffix)
+LIBJEMALLOC := $(LIBPREFIX)jemalloc$(install_suffix)
 
 # Lists of files.
 BINS := $(srcroot)bin/pprof $(objroot)bin/jemalloc.sh
diff --git a/configure.ac b/configure.ac
index ba5355a..5bdddfa 100644
--- a/configure.ac
+++ b/configure.ac
@@ -198,7 +198,7 @@ so="so"
 o="o"
 a="a"
 exe=
-lib="lib"
+libprefix="lib"
 DSO_LDFLAGS='-shared -Wl,-soname,$(@F)'
 RPATH='-Wl,-rpath,$(1)'
 SOREV='$(SO).$(REV)'
@@ -281,6 +281,7 @@ case "${host}" in
 	DSO_LDFLAGS="-shared"
 	o="obj"
 	a="lib"
+	libprefix=""
 	exe=".exe"
 	SOREV='$(SO)'
 	PIC_CFLAGS=""
@@ -297,7 +298,7 @@ AC_SUBST([so])
 AC_SUBST([o])
 AC_SUBST([a])
 AC_SUBST([exe])
-AC_SUBST([lib])
+AC_SUBST([libprefix])
 AC_SUBST([DSO_LDFLAGS])
 AC_SUBST([SOREV])
 AC_SUBST([PIC_CFLAGS])
-- 
1.7.10




More information about the jemalloc-discuss mailing list