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}
f='/guix/diff/tests/services.scm?id=3d2c1494ac80af1c0450e6a817b3bb7e3b7d9a5d'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/tests/services.scm'>
<input type='hidden' name='id' value='3d2c1494ac80af1c0450e6a817b3bb7e3b7d9a5d'/><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=3d2c1494ac80af1c0450e6a817b3bb7e3b7d9a5d'>root</a>/<a href='/guix/log/tests?id=3d2c1494ac80af1c0450e6a817b3bb7e3b7d9a5d'>tests</a>/<a href='/guix/log/tests/services.scm?id=3d2c1494ac80af1c0450e6a817b3bb7e3b7d9a5d'>services.scm</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/tests/services.scm?id=3d2c1494ac80af1c0450e6a817b3bb7e3b7d9a5d&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2023-08-31 23:31:50 -0400'>2023-08-31</span></td><td><a href='/guix/commit/tests/services.scm?id=f66fa5f917e76935187935b09ae7ac037b8b35f8'>gnu: services: Revert to deleting and updating all matching services</a><span class='msg-avail'>...</span></td><td>Brian Cully</td></tr>
<tr><td><span title='2023-06-06 11:54:39 +0200'>2023-06-06</span></td><td><a href='/guix/commit/tests/services.scm?id=181951207339508789b28ba7cb914f983319920f'>services: 'modify-services' preserves service ordering.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2023-06-02 16:16:12 +0200'>2023-06-02</span></td><td><a href='/guix/commit/tests/services.scm?id=ae707b62e71b1fae054eb422412384bcc8d39fa9'>tests: Check for service existence in MODIFY-SERVICES</a><span class='msg-avail'>...</span></td><td>Brian Cully</td></tr>
<tr><td><span title='2023-06-02 16:16:07 +0200'>2023-06-02</span></td><td><a href='/guix/commit/tests/services.scm?id=09fcf261c1f66a07891ec2fe80f8652fd286bd3e'>tests: Add tests for MODIFY-SERVICES procedure</a><span class='msg-avail'>...</span></td><td>Brian Cully</td></tr>