From 061d3ec62707a526a83482e57d202a66f9d776cd Mon Sep 17 00:00:00 2001
From: Ismael Luceno <ismael@iodev.co.uk>
Date: Tue, 23 Aug 2022 19:34:39 +0200
Subject: [PATCH] Test the -m32 and -m64 compiler flags before use

Fixes: https://github.com/haampie/libtree/issues/78
Signed-off-by: Ismael Luceno <ismael@iodev.co.uk>
---
 tests/05_32_bits/Makefile | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/tests/05_32_bits/Makefile b/tests/05_32_bits/Makefile
index 2c0bece..5628f42 100644
--- a/tests/05_32_bits/Makefile
+++ b/tests/05_32_bits/Makefile
@@ -3,7 +3,7 @@
 
 LD_LIBRARY_PATH=
 
-.PHONY: clean
+.PHONY: clean check
 
 all: check
 
@@ -21,11 +21,21 @@ exe64: lib64/libx.so
 exe32: lib32/libx.so
 	echo 'extern int a(); int _start(){return a();}' | $(CC) -m32 "-Wl,-rpath,$(CURDIR)/lib64" "-Wl,-rpath,$(CURDIR)/lib32" -o $@ -nostdlib -x c - -Llib32 -lx
 
-check: exe32 exe64
-	../../libtree exe32
-	../../libtree exe64
-
 clean:
 	rm -rf lib32 lib64 exe*
 
 CURDIR ?= $(.CURDIR)
+
+test-flag = 2>/dev/null ${CC} -E /dev/null
+test-end = && echo y || echo n
+support-m32 != ${test-flag} -m32 ${test-end}
+support-m64 != ${test-flag} -m64 ${test-end}
+
+check${support-m32:y=}:: exe32
+	../../libtree exe32
+
+check${support-m64:y=}:: exe64
+	../../libtree exe64
+
+check${support-m32:n=} check${support-m64:n=}::
+	@echo WARNING: test skipped at ${CURDIR}
7e8e97cd4618b04e6b3'>commit</a><a href='/guix/diff/doc/local.mk?id=1deaa74a6fbe07ae7052e7e8e97cd4618b04e6b3'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/doc/local.mk'>
<input type='hidden' name='id' value='1deaa74a6fbe07ae7052e7e8e97cd4618b04e6b3'/><input type='hidden' name='showmsg' value='1'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/guix/log/?id=1deaa74a6fbe07ae7052e7e8e97cd4618b04e6b3&amp;showmsg=1'>root</a>/<a href='/guix/log/doc?id=1deaa74a6fbe07ae7052e7e8e97cd4618b04e6b3&amp;showmsg=1'>doc</a>/<a href='/guix/log/doc/local.mk?id=1deaa74a6fbe07ae7052e7e8e97cd4618b04e6b3&amp;showmsg=1'>local.mk</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/doc/local.mk?id=1deaa74a6fbe07ae7052e7e8e97cd4618b04e6b3'>Collapse</a>)</th><th class='left'>Author</th></tr>
<tr class='logheader'><td><span title='2023-08-29 14:52:21 -0400'>2023-08-29</span></td><td class='logsubject'><a href='/guix/commit/doc/local.mk?id=0d9619354bf6c51a26bee7eb52073023dedafd49'>doc: Fix a potential problem in man page generation rule.</a></td><td>Maxim Cournoyer</td></tr>
<tr class='nohover-highlight'><td/><td colspan='3' class='logmsg'>
Since commit ca8acad3 ("build: Add dependency on guix script for help2man
targets."), the $&lt; special Make variable in the recipe was matching
scripts/guix instead of the more specific 'guix/scripts/%.scm' source.

* doc/local.mk ($(srcdir)/%D%/guix-%.1): Move the scripts/guix prerequisite to
the end.


</td></tr>
<tr class='logheader'><td><span title='2023-08-25 14:24:24 +0200'>2023-08-25</span></td><td class='logsubject'><a href='/guix/commit/doc/local.mk?id=ca8acad38264dd29a808904d3ce8e7249194d95f'>build: Add dependency on guix script for help2man targets.</a></td><td>Josselin Poiret</td></tr>
<tr class='nohover-highlight'><td/><td colspan='3' class='logmsg'>
* doc/local.mk: Add dependency on guix script for help2man targets.

Signed-off-by: Ludovic Courtès &lt;ludo@gnu.org&gt;


</td></tr>
<tr class='logheader'><td><span title='2022-11-19 19:54:14 +0100'>2022-11-19</span></td><td class='logsubject'><a href='/guix/commit/doc/local.mk?id=6d1177b2c826d49cfb218db389a72869a28b0398'>doc: Build more man pages.</a></td><td>Hilton Chain</td></tr>
<tr class='nohover-highlight'><td/><td colspan='3' class='logmsg'>
* doc/local.mk (sub_commands_mans): Add guix-container.1, guix-copy.1,
guix-describe.1, guix-git.1, guix-graph.1, guix-home.1, guix-offload.1,
guix-pack.1, guix-processes.1, guix-repl.1, guix-shell.1, guix-style.1.

Signed-off-by: Ludovic Courtès &lt;ludo@gnu.org&gt;


</td></tr>