diff options
| author | Wolfgang Jenkner | 2016-01-30 14:20:56 -0800 |
|---|---|---|
| committer | Paul Eggert | 2016-01-30 15:26:06 -0800 |
| commit | a5f85861293911b3f394464a04f7972b83d47a95 (patch) | |
| tree | 969c762d8b50131993e9967c6031bf3d05cf0d4a /lib | |
| parent | cb22fce283e3852ea33a09f40707cf0c004c717e (diff) | |
| download | emacs-a5f85861293911b3f394464a04f7972b83d47a95.tar.gz emacs-a5f85861293911b3f394464a04f7972b83d47a95.zip | |
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.am | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/lib/Makefile.am b/lib/Makefile.am index cda96811ebc..a1dd6a4ca90 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am | |||
| @@ -17,6 +17,15 @@ include gnulib.mk | |||
| 17 | libgnu_a_SOURCES += openat-die.c save-cwd.c | 17 | libgnu_a_SOURCES += openat-die.c save-cwd.c |
| 18 | endif | 18 | endif |
| 19 | 19 | ||
| 20 | noinst_LIBRARIES += libegnu.a | ||
| 21 | |||
| 22 | libegnu_a_SOURCES = $(libgnu_a_SOURCES) | ||
| 23 | libegnu_a_LIBADD = $(patsubst %.o,e-%.o,$(libgnu_a_LIBADD)) | ||
| 24 | EXTRA_libegnu_a_SOURCES = $(EXTRA_libgnu_a_SOURCES) | ||
| 25 | libegnu_a_SHORTNAME = e | ||
| 26 | |||
| 27 | libegnu_a_CPPFLAGS = $(AM_CPPFLAGS) -Demacs | ||
| 28 | |||
| 20 | .PHONY: bootstrap-clean | 29 | .PHONY: bootstrap-clean |
| 21 | 30 | ||
| 22 | bootstrap-clean: maintainer-clean | 31 | bootstrap-clean: maintainer-clean |