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}
a href='/guix/diff/nix/libutil/util.cc?id=3485984a090edd5b1721a69a389a2e44077354e7'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/nix/libutil/util.cc'>
<input type='hidden' name='id' value='3485984a090edd5b1721a69a389a2e44077354e7'/><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=3485984a090edd5b1721a69a389a2e44077354e7'>root</a>/<a href='/guix/log/nix?id=3485984a090edd5b1721a69a389a2e44077354e7'>nix</a>/<a href='/guix/log/nix/libutil?id=3485984a090edd5b1721a69a389a2e44077354e7'>libutil</a>/<a href='/guix/log/nix/libutil/util.cc?id=3485984a090edd5b1721a69a389a2e44077354e7'>util.cc</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/nix/libutil/util.cc?id=3485984a090edd5b1721a69a389a2e44077354e7&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2021-11-19 23:04:19 +0100'>2021-11-19</span></td><td><a href='/guix/commit/nix/libutil/util.cc?id=24224530d1f4a70808d003ba8dce849b77625b79'>daemon: Micro-optimize 'deletePath'.</a><span class='msg-avail'>...<span class='msg-tooltip'>'remove' calls 'unlink' first and falls back to 'rmdir' upon EISDIR.
This change gets rid of the 'unlink' call for every directory being
removed.

* nix/libutil/util.cc (_deletePath): Call 'unlink' or 'rmdir' depending
on 'st.st_mode', rather than call 'remove'.
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2020-12-08 22:30:07 +0100'>2020-12-08</span></td><td><a href='/guix/commit/nix/libutil/util.cc?id=2e308238ad09e9527f9b8c3ec4a90b6b05a93367'>daemon: 'Agent' constructor takes a list of environment variables.</a><span class='msg-avail'>...<span class='msg-tooltip'>* nix/libutil/util.hh (struct Agent)[Agent]: Add 'env' parameter.
* nix/libutil/util.cc (Agent::Agent): Honor it.
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2020-09-14 15:42:55 +0200'>2020-09-14</span></td><td><a href='/guix/commit/nix/libutil/util.cc?id=ee9dff34f9317509cb2b833d07a0d5e01a36a4ae'>daemon: Move 'Agent' to libutil.</a><span class='msg-avail'>...<span class='msg-tooltip'>* nix/libstore/build.cc (DerivationGoal::tryBuildHook): Add "offload" to
'args' and pass settings.guixProgram as the first argument to
Agent::Agent.
(pathNullDevice, commonChildInit, Agent, Agent::Agent)
(Agent::~Agent): Move to...
* nix/libutil/util.cc: ... here.
* nix/libutil/util.hh (struct Agent, commonChildInit): New
declarations.
</span></span></td><td>Ludovic Courtès</td></tr>