[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master 2f7885a: Fix mod-test build failure
From: |
Paul Eggert |
Subject: |
[Emacs-diffs] master 2f7885a: Fix mod-test build failure |
Date: |
Mon, 25 Feb 2019 20:45:16 -0500 (EST) |
branch: master
commit 2f7885a4b3609dec19e4595c6c24f3a21f33c5d6
Author: Paul Eggert <address@hidden>
Commit: Paul Eggert <address@hidden>
Fix mod-test build failure
Problem reported by Glenn Morris in:
https://lists.gnu.org/r/emacs-devel/2019-02/msg00739.html
* test/Makefile.in (HYBRID_MALLOC, LIBEGNU_ARCHIVE):
New macros, taken from ../src/Makefile.in.
(MODULE_CFLAGS): Add -I$(srcdir)/../lib.
($(test_module)): Link $(LIBEGNU_ARCHIVE) too.
---
test/Makefile.in | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/test/Makefile.in b/test/Makefile.in
index 4eddb67..ce6ce04 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -254,17 +254,21 @@ else
FPIC_CFLAGS = -fPIC
endif
+HYBRID_MALLOC = @HYBRID_MALLOC@
+LIBEGNU_ARCHIVE = ../lib/lib$(if $(HYBRID_MALLOC),e)gnu.a
+
# Note: emacs-module.h is generated from emacs-module.h.in, hence we
# look in ../src, not $(srcdir)/../src.
-MODULE_CFLAGS = -I../src $(FPIC_CFLAGS) $(PROFILING_CFLAGS) \
+MODULE_CFLAGS = -I../src -I$(srcdir)/../lib \
+ $(FPIC_CFLAGS) $(PROFILING_CFLAGS) \
$(WARN_CFLAGS) $(WERROR_CFLAGS) $(CFLAGS)
test_module = $(test_module_dir)/mod-test${SO}
src/emacs-module-tests.log: $(test_module)
-$(test_module): $(test_module:${SO}=.c) ../src/emacs-module.h
+$(test_module): $(test_module:${SO}=.c) ../src/emacs-module.h
$(LIBEGNU_ARCHIVE)
$(AM_V_at)${MKDIR_P} $(dir $@)
$(AM_V_CCLD)$(CC) -shared $(CPPFLAGS) $(MODULE_CFLAGS) $(LDFLAGS) \
- -o $@ $<
+ -o $@ $< $(LIBEGNU_ARCHIVE)
endif
## Check that there is no 'automated' subdirectory, which would
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] master 2f7885a: Fix mod-test build failure,
Paul Eggert <=