FIX: Moved linker options to the correct automake variable.

yvoinov · Sep 23, 2024 · 1fc28e6 · 1fc28e6
1 parent a4f9f14
commit 1fc28e6
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -123,3 +123,7 @@ IMPROVEMENT: Got rid dlopen call due to unified preload scheme for all platforms
 09-22-2024
 ==========
 IMPROVEMENT: Complete refactoring; no more if's in wrapper functions.
+
+09-23-2024
+==========
+FIX: Moved linker options to the correct automake variable.
diff --git a/src/Makefile.am b/src/Makefile.am
@@ -1,5 +1,5 @@
 AM_CPPFLAGS = -I$(top_srcdir)/src
-AM_LDFLAGS = -Wl,--wrap=malloc -Wl,--wrap=free -Wl,--wrap=cfree -Wl,--wrap=realloc -Wl,--wrap=calloc -Wl,--wrap=memalign -Wl,--wrap=posix_memalign -Wl,--wrap=aligned_alloc -Wl,--wrap=valloc -Wl,--wrap=pvalloc -Wl,--wrap=malloc_usable_size -Wl,--wrap=malloc_trim
+AM_CXXFLAGS = -Wl,--wrap=malloc -Wl,--wrap=free -Wl,--wrap=cfree -Wl,--wrap=realloc -Wl,--wrap=calloc -Wl,--wrap=memalign -Wl,--wrap=posix_memalign -Wl,--wrap=aligned_alloc -Wl,--wrap=valloc -Wl,--wrap=pvalloc -Wl,--wrap=malloc_usable_size -Wl,--wrap=malloc_trim
 
 libmemproxy_la_CXXFLAGS = @CXXFLAGS@ -fPIC -DCONF_FILE=$(sysconfdir)/$(PACKAGE_NAME).conf
 libmemproxy_la_LDFLAGS = @LDFLAGS@ -shared -version-info @MEMPROXY_CURRENT@:@MEMPROXY_REVISION@:@MEMPROXY_AGE@

diff --git a/src/Makefile.in b/src/Makefile.in
@@ -233,9 +233,9 @@ am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/autoconf.h.in \
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
-AM_CXXFLAGS = @AM_CXXFLAGS@
+AM_CXXFLAGS = -Wl,--wrap=malloc -Wl,--wrap=free -Wl,--wrap=cfree -Wl,--wrap=realloc -Wl,--wrap=calloc -Wl,--wrap=memalign -Wl,--wrap=posix_memalign -Wl,--wrap=aligned_alloc -Wl,--wrap=valloc -Wl,--wrap=pvalloc -Wl,--wrap=malloc_usable_size -Wl,--wrap=malloc_trim
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AM_LDFLAGS = -Wl,--wrap=malloc -Wl,--wrap=free -Wl,--wrap=cfree -Wl,--wrap=realloc -Wl,--wrap=calloc -Wl,--wrap=memalign -Wl,--wrap=posix_memalign -Wl,--wrap=aligned_alloc -Wl,--wrap=valloc -Wl,--wrap=pvalloc -Wl,--wrap=malloc_usable_size -Wl,--wrap=malloc_trim
+AM_LDFLAGS = @AM_LDFLAGS@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@