Fix jemalloc.sh code generation.
Fix jemalloc.sh code generation by adding @sorev@ and using it instead of @SOREV@ (which contains Makefile-specific variables).
This commit is contained in:
parent
461ad5c87a
commit
a4936ce4d6
@ -4,6 +4,6 @@ prefix=@prefix@
|
|||||||
exec_prefix=@exec_prefix@
|
exec_prefix=@exec_prefix@
|
||||||
libdir=@libdir@
|
libdir=@libdir@
|
||||||
|
|
||||||
@LD_PRELOAD_VAR@=${libdir}/libjemalloc.@SOREV@
|
@LD_PRELOAD_VAR@=${libdir}/libjemalloc.@sorev@
|
||||||
export @LD_PRELOAD_VAR@
|
export @LD_PRELOAD_VAR@
|
||||||
exec "$@"
|
exec "$@"
|
||||||
|
@ -202,6 +202,7 @@ libprefix="lib"
|
|||||||
DSO_LDFLAGS='-shared -Wl,-soname,$(@F)'
|
DSO_LDFLAGS='-shared -Wl,-soname,$(@F)'
|
||||||
RPATH='-Wl,-rpath,$(1)'
|
RPATH='-Wl,-rpath,$(1)'
|
||||||
SOREV='$(SO).$(REV)'
|
SOREV='$(SO).$(REV)'
|
||||||
|
sorev="${so}.${rev}"
|
||||||
PIC_CFLAGS='-fPIC -DPIC'
|
PIC_CFLAGS='-fPIC -DPIC'
|
||||||
|
|
||||||
dnl Heap profiling uses the log(3) function.
|
dnl Heap profiling uses the log(3) function.
|
||||||
@ -226,6 +227,7 @@ case "${host}" in
|
|||||||
force_tls="0"
|
force_tls="0"
|
||||||
DSO_LDFLAGS='-shared -Wl,-dylib_install_name,$(@F)'
|
DSO_LDFLAGS='-shared -Wl,-dylib_install_name,$(@F)'
|
||||||
SOREV='$(REV).$(SO)'
|
SOREV='$(REV).$(SO)'
|
||||||
|
sorev="${rev}.${so}"
|
||||||
;;
|
;;
|
||||||
*-*-freebsd*)
|
*-*-freebsd*)
|
||||||
CFLAGS="$CFLAGS"
|
CFLAGS="$CFLAGS"
|
||||||
@ -284,6 +286,7 @@ case "${host}" in
|
|||||||
libprefix=""
|
libprefix=""
|
||||||
exe=".exe"
|
exe=".exe"
|
||||||
SOREV='$(SO)'
|
SOREV='$(SO)'
|
||||||
|
sorev="${so}"
|
||||||
PIC_CFLAGS=""
|
PIC_CFLAGS=""
|
||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
@ -301,6 +304,7 @@ AC_SUBST([exe])
|
|||||||
AC_SUBST([libprefix])
|
AC_SUBST([libprefix])
|
||||||
AC_SUBST([DSO_LDFLAGS])
|
AC_SUBST([DSO_LDFLAGS])
|
||||||
AC_SUBST([SOREV])
|
AC_SUBST([SOREV])
|
||||||
|
AC_SUBST([sorev])
|
||||||
AC_SUBST([PIC_CFLAGS])
|
AC_SUBST([PIC_CFLAGS])
|
||||||
|
|
||||||
JE_COMPILABLE([__attribute__ syntax],
|
JE_COMPILABLE([__attribute__ syntax],
|
||||||
|
Loading…
Reference in New Issue
Block a user