From 385f54c913bf1b6fc239c9de7ad7270d19af8360 Mon Sep 17 00:00:00 2001
From: Martin Stjernholm <mast@lysator.liu.se>
Date: Wed, 2 Aug 2006 22:59:47 +0200
Subject: [PATCH] Ensure that the final pike is used for testing and module
dumping.
Rev: src/make_variables.in:1.27
Rev: src/modules/common_module_makefile.in:1.45
Rev: src/modules/dynamic_module_makefile.in:1.122
---
src/make_variables.in | 3 ++-
src/modules/common_module_makefile.in | 6 +++---
src/modules/dynamic_module_makefile.in | 6 +++---
3 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/src/make_variables.in b/src/make_variables.in
index 25ae5311a0..99fa6f3050 100644
--- a/src/make_variables.in
+++ b/src/make_variables.in
@@ -1,6 +1,6 @@
# -*- Makefile -*-
#
-# $Id: make_variables.in,v 1.26 2006/08/02 20:16:38 mast Exp $
+# $Id: make_variables.in,v 1.27 2006/08/02 20:59:47 mast Exp $
#
# Note: This template is actually used only for make_variables in the
# subdirectories; the one created in the build base dir is just an
@@ -35,6 +35,7 @@ TMP_LIBDIR=$(TMP_BUILDDIR)/lib
SRCDIR=@srcdir@
DEFAULT_RUNPIKE=$(TMP_BUILDDIR)/$(BUILD_PIKE) -DNOT_INSTALLED -DPRECOMPILED_SEARCH_MORE -m$(TMP_BUILDDIR)/master.pike $(PIKEOPTS)
+FINAL_PIKE=$(TMP_BUILDDIR)/pike -DNOT_INSTALLED -DPRECOMPILED_SEARCH_MORE -m$(TMP_BUILDDIR)/master.pike $(PIKEOPTS)
USE_PIKE=pike $(PIKEOPTS)
RUNPIKE=$(@RUNPIKE@)
diff --git a/src/modules/common_module_makefile.in b/src/modules/common_module_makefile.in
index bf8d0a236c..41dd801992 100644
--- a/src/modules/common_module_makefile.in
+++ b/src/modules/common_module_makefile.in
@@ -1,5 +1,5 @@
#
-# $Id: common_module_makefile.in,v 1.44 2006/08/02 20:16:38 mast Exp $
+# $Id: common_module_makefile.in,v 1.45 2006/08/02 20:59:47 mast Exp $
#
# Contains stuff common to both dynamic_module_makefile and
# static_module_makefile.
@@ -197,10 +197,10 @@ testsuite: $(SRCDIR)/testsuite.in $(REAL_TESTSUITE) $(TMP_BINDIR)/mktestsuite
extra_tests: $(MODULE_TESTS)
verify: testsuite $(MODULE_TESTS) $(PIKE_EXTERNAL_MODULE)
- $(RUNPIKE) -Mplib/modules $(TMP_BINDIR)/test_pike.pike testsuite
+ $(FINAL_PIKE) -Mplib/modules $(TMP_BINDIR)/test_pike.pike testsuite
verbose_verify: testsuite $(MODULE_TESTS) $(PIKE_EXTERNAL_MODULE)
- @$(RUNPIKE) -Mplib/modules $(TMP_BINDIR)/test_pike.pike testsuite --verbose
+ @$(FINAL_PIKE) -Mplib/modules $(TMP_BINDIR)/test_pike.pike testsuite --verbose
gdb_verify: testsuite $(PIKE_EXTERNAL_MODULE)
@echo >.gdbinit handle SIGUSR1 nostop noprint pass
diff --git a/src/modules/dynamic_module_makefile.in b/src/modules/dynamic_module_makefile.in
index 1774a76c98..c2475e0e62 100644
--- a/src/modules/dynamic_module_makefile.in
+++ b/src/modules/dynamic_module_makefile.in
@@ -1,5 +1,5 @@
#
-# $Id: dynamic_module_makefile.in,v 1.121 2006/08/02 20:29:18 mast Exp $
+# $Id: dynamic_module_makefile.in,v 1.122 2006/08/02 20:59:47 mast Exp $
#
LIBGCC=@LIBGCC@
@@ -118,11 +118,11 @@ local_install: $(MODULE_INSTALL)
dump_module: install
-rm -f dumpmodule.log
args=$${args:-"--log-file --update-only=dumpversion --report-failed"}; \
- $(RUNPIKE) -x dump $$args \
+ $(FINAL_PIKE) -x dump $$args \
--recursive "$(SYSTEM_MODULE_PATH)/$(MODDIR)$(MODNAME).pmod"
dump_local_module: install
-rm -f dumpmodule.log
args=$${args:-"--log-file --update-only=dumpversion --report-failed"}; \
- $(RUNPIKE) -x dump $$args \
+ $(FINAL_PIKE) -x dump $$args \
--recursive "$(LOCAL_MODULE_PATH)/$(MODDIR)$(MODNAME).pmod"
--
GitLab