From 93fd6d31ce441c5ab394f31355584d17ef6e455a Mon Sep 17 00:00:00 2001 From: Marcio Barbosa Date: Mon, 10 Sep 2018 18:14:55 +0000 Subject: [PATCH] autoconf: Use `uname -p` instead of $HOST_CPU for ctf tools Currently, we check if the ctf tools are present searching for them in a few directories. One of these directories (/opt/onbld/bin/$HOST_CPU) looks at the $HOST_CPU variable, which on x86 can be 'x86_64' or 'i386', but the only valid directories for the onbld tools are 'i386' and 'sparc'. So instead of $HOST_CPU, just use $(uname -p), which is only ever 'i386' on x86, and 'sparc' on sparc. [adeason@sinenomine.net: reword commit message] Change-Id: I972cf1cc0dda81f5ee454b14ddbe2830c82c838d Reviewed-on: https://gerrit.openafs.org/13275 Tested-by: BuildBot Reviewed-by: Benjamin Kaduk --- src/cf/ctf-tools.m4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/cf/ctf-tools.m4 b/src/cf/ctf-tools.m4 index a45529d73c..341021449b 100644 --- a/src/cf/ctf-tools.m4 +++ b/src/cf/ctf-tools.m4 @@ -1,6 +1,6 @@ AC_DEFUN([OPENAFS_CTF_TOOLS_CHECKS],[ -CTF_DEFAULT_PATH="$PATH:/usr/bin:/opt/onbld/bin/$HOST_CPU" +CTF_DEFAULT_PATH="$PATH:/usr/bin:/opt/onbld/bin/$(uname -p)" AC_ARG_WITH([ctf-tools], AS_HELP_STRING([--with-ctf-tools@<:@=DIR@:>@],