summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorWolfgang Jenkner <wjenkner@inode.at>2016-01-30 14:20:56 -0800
committerPaul Eggert <eggert@cs.ucla.edu>2016-01-30 15:26:06 -0800
commita5f85861293911b3f394464a04f7972b83d47a95 (patch)
tree969c762d8b50131993e9967c6031bf3d05cf0d4a /lib
parentcb22fce283e3852ea33a09f40707cf0c004c717e (diff)
Link temacs with gnulib compiled with -Demacs
This is done to support HYBRID_MALLOC, since some static variables (e.g., last_environ in putenv.c) hold pointers to memory malloced before dumping (Bug#22086). * lib/Makefile.am: Add incantation to install libegnu.a. * src/Makefile.in ($(lib)/libgnu.a): Replace with libegnu.a (temacs$(EXEEXT)): Use it.
Diffstat (limited to 'lib')
-rw-r--r--lib/Makefile.am9
1 files changed, 9 insertions, 0 deletions
diff --git a/lib/Makefile.am b/lib/Makefile.am
index cda96811eb..a1dd6a4ca9 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -17,6 +17,15 @@ include gnulib.mk
libgnu_a_SOURCES += openat-die.c save-cwd.c
endif
+noinst_LIBRARIES += libegnu.a
+
+libegnu_a_SOURCES = $(libgnu_a_SOURCES)
+libegnu_a_LIBADD = $(patsubst %.o,e-%.o,$(libgnu_a_LIBADD))
+EXTRA_libegnu_a_SOURCES = $(EXTRA_libgnu_a_SOURCES)
+libegnu_a_SHORTNAME = e
+
+libegnu_a_CPPFLAGS = $(AM_CPPFLAGS) -Demacs
+
.PHONY: bootstrap-clean
bootstrap-clean: maintainer-clean