[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[lmi-commits] [5143] Temporarily work around problems with nondefault 'b
From: |
Greg Chicares |
Subject: |
[lmi-commits] [5143] Temporarily work around problems with nondefault 'build_type' |
Date: |
Thu, 10 Feb 2011 22:18:10 +0000 |
Revision: 5143
http://svn.sv.gnu.org/viewvc/?view=rev&root=lmi&revision=5143
Author: chicares
Date: 2011-02-10 22:18:09 +0000 (Thu, 10 Feb 2011)
Log Message:
-----------
Temporarily work around problems with nondefault 'build_type'
Modified Paths:
--------------
lmi/trunk/GNUmakefile
lmi/trunk/workhorse.make
Modified: lmi/trunk/GNUmakefile
===================================================================
--- lmi/trunk/GNUmakefile 2011-01-19 23:30:15 UTC (rev 5142)
+++ lmi/trunk/GNUmakefile 2011-02-10 22:18:09 UTC (rev 5143)
@@ -456,17 +456,17 @@
.PHONY: test_various_build_types
test_various_build_types: source_clean
+ -$(MAKE) all test build_type=mpatrol
+ -$(MAKE) test build_type=safestdlib
+ -$(MAKE) lmi_wx_shared$(EXEEXT) build_type=so_test USE_SO_ATTRIBUTES=1
-$(MAKE) check_concinnity
-$(MAKE) check_physical_closure
-$(MAKE) all test
- -$(MAKE) all test build_type=mpatrol
- -$(MAKE) test build_type=safestdlib
- -$(MAKE) lmi_wx_shared$(EXEEXT) build_type=so_test USE_SO_ATTRIBUTES=1
.PHONY: nychthemeral_test
nychthemeral_test: checkout
-$(MAKE) --directory=$(nychthemeral_directory)/lmi
test_various_build_types \
- >../$(nychthemeral_log)
+ >../$(nychthemeral_log) 2>&1
################################################################################
Modified: lmi/trunk/workhorse.make
===================================================================
--- lmi/trunk/workhorse.make 2011-01-19 23:30:15 UTC (rev 5142)
+++ lmi/trunk/workhorse.make 2011-02-10 22:18:09 UTC (rev 5143)
@@ -89,11 +89,20 @@
libantediluvian$(SHREXT) \
liblmi$(SHREXT) \
lmi_cli_shared$(EXEEXT) \
- lmi_wx_shared$(EXEEXT) \
- wx_new$(SHREXT) \
+# For targets that depend on wx, build type 'safestdlib' requires a
+# compatible wx build, which is not yet available.
+
+ifneq (safestdlib,$(findstring safestdlib,$(build_type)))
+ default_targets += \
+ lmi_wx_shared$(EXEEXT) \
+ wx_new$(SHREXT) \
+
+endif
+
# The product_files target doesn't build with shared-library
-# 'attributes'. That matters little because that target is deprecated.
+# 'attributes'. It can be built with mpatrol, but the resulting binary
+# segfaults. This matters little because that target is deprecated.
#
# TODO ?? The gpt server, however, is important; it needs work anyway.
# The other binaries should be reconsidered. The antediluvian $(EXEEXT)
@@ -112,8 +121,12 @@
gpt_server$(EXEEXT) \
gpt_so_test$(EXEEXT) \
ihs_crc_comp$(EXEEXT) \
- product_files$(EXEEXT) \
+ ifneq (mpatrol,$(findstring mpatrol,$(build_type)))
+ default_targets += \
+ product_files$(EXEEXT) \
+
+ endif
endif
.PHONY: effective_default_target
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [lmi-commits] [5143] Temporarily work around problems with nondefault 'build_type',
Greg Chicares <=