[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[lmi-commits] [lmi] master b8afd2d8 05/13: Disentangle conditionals for
From: |
Greg Chicares |
Subject: |
[lmi-commits] [lmi] master b8afd2d8 05/13: Disentangle conditionals for one target |
Date: |
Tue, 7 Jun 2022 16:39:09 -0400 (EDT) |
branch: master
commit b8afd2d86897bce60080de8ee017516e1dd3675b
Author: Gregory W. Chicares <gchicares@sbcglobal.net>
Commit: Gregory W. Chicares <gchicares@sbcglobal.net>
Disentangle conditionals for one target
---
workhorse.make | 21 +++++++++++++++------
1 file changed, 15 insertions(+), 6 deletions(-)
diff --git a/workhorse.make b/workhorse.make
index 3354db7a..facfa037 100644
--- a/workhorse.make
+++ b/workhorse.make
@@ -95,6 +95,20 @@ ifeq (ubsan,$(findstring ubsan,$(build_type)))
endif
+# 'test_coding_rules' depends on PCRE2, which is installed only for
+# x86_64-pc-linux-gnu.
+
+ifneq (x86_64-pc-linux-gnu,$(LMI_TRIPLET))
+ excluded_default_targets += test_coding_rules$(EXEEXT)
+endif
+
+# 'test_coding_rules' is incompatible with $(USE_SO_ATTRIBUTES)
+# because it uses no shared library.
+
+ifdef USE_SO_ATTRIBUTES
+ excluded_default_targets += test_coding_rules$(EXEEXT)
+endif
+
# Effective default target (described above under "Default target").
default_targets := \
@@ -103,6 +117,7 @@ default_targets := \
libantediluvian$(SHREXT) \
liblmi$(SHREXT) \
lmi_cli_shared$(EXEEXT) \
+ test_coding_rules$(EXEEXT) \
# For targets that depend on wx, build type 'safestdlib' requires a
# compatible wx build, which is not yet available.
@@ -135,12 +150,6 @@ ifeq (,$(USE_SO_ATTRIBUTES))
lmi_md5sum$(EXEEXT) \
rate_table_tool$(EXEEXT) \
- ifeq (x86_64-pc-linux-gnu,$(LMI_TRIPLET))
- default_targets += \
- test_coding_rules$(EXEEXT) \
-
- endif
-
ifneq (so_test,$(findstring so_test,$(build_type)))
default_targets += \
product_files$(EXEEXT) \
- [lmi-commits] [lmi] master updated (b3f9681c -> 56930208), Greg Chicares, 2022/06/07
- [lmi-commits] [lmi] master 56930208 13/13: Simplify, Greg Chicares, 2022/06/07
- [lmi-commits] [lmi] master b8afd2d8 05/13: Disentangle conditionals for one target,
Greg Chicares <=
- [lmi-commits] [lmi] master 10dfe448 03/13: Prepare to refactor, Greg Chicares, 2022/06/07
- [lmi-commits] [lmi] master cb7f345f 11/13: Assert that there is OAOO $(build_type), Greg Chicares, 2022/06/07
- [lmi-commits] [lmi] master a9468c0f 02/13: Remove an obsolete defect marker [272], Greg Chicares, 2022/06/07
- [lmi-commits] [lmi] master 7a434503 06/13: Don't attempt to build "erroneous" targets, Greg Chicares, 2022/06/07
- [lmi-commits] [lmi] master a2d6b2ac 12/13: Migrate one last conditional, Greg Chicares, 2022/06/07
- [lmi-commits] [lmi] master 3b1b8a3d 10/13: Migrate another conditional, Greg Chicares, 2022/06/07
- [lmi-commits] [lmi] master 58f81cc4 07/13: For $(build_type) 'so_test', always set $(USE_SO_ATTRIBUTES), Greg Chicares, 2022/06/07
- [lmi-commits] [lmi] master eb5f30b7 09/13: Disentangle another conditional, Greg Chicares, 2022/06/07
- [lmi-commits] [lmi] master fbcd6ee8 04/13: Don't use UBSan with antediluvian targets, Greg Chicares, 2022/06/07
- [lmi-commits] [lmi] master bd3468c5 01/13: Assert another precondition, Greg Chicares, 2022/06/07