[PATCH vkd3d] build: Disable crosstests as well if tests are disabled.

Giovanni Mascellani gmascellani at codeweavers.com
Wed Jan 26 01:54:01 CST 2022


Hi,

does this patch change anything other than what is printed at the end of 
the configuration step? It seems to me that the only variable that 
changes with this commit is HAVE_CROSSTEST, and I can't see where that 
is used other than at the end of configure.ac.

Also, configuring with --disable-tests and then running "make crosstest" 
happily compiled the cross tests for me.

Giovanni.


Il 26/01/22 01:17, Zebediah Figura ha scritto:
> Signed-off-by: Zebediah Figura <zfigura at codeweavers.com>
> ---
>   configure.ac | 6 +++---
>   1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/configure.ac b/configure.ac
> index d296dfd4b..f69f1ea4a 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -148,7 +148,7 @@ AC_CONFIG_FILES([Makefile])
>   AC_OUTPUT
>   
>   dnl Output configuration summary
> -AS_IF([test "x$CROSSTARGET32" != "xno" -o "x$CROSSTARGET64" != "xno"],
> +AS_IF([test "x$enable_tests" != "xno" -a \( "x$CROSSTARGET32" != "xno" -o "x$CROSSTARGET64" != "xno" \)],
>         [HAVE_CROSSTEST=yes], [HAVE_CROSSTEST=no])
>   AS_IF([test $DX_FLAG_doc = 1], [HAVE_DOCS=yes], [HAVE_DOCS=no])
>   
> @@ -166,6 +166,6 @@ AS_ECHO(["
>     Building documentation: ${HAVE_DOCS}
>   
>     Building crosstests: ${HAVE_CROSSTEST}"])
> -AS_IF([test "x$CROSSTARGET32" != "xno"], [AS_ECHO(["    Using 32-bit cross compiler: $CROSSCC32"])])
> -AS_IF([test "x$CROSSTARGET64" != "xno"], [AS_ECHO(["    Using 64-bit cross compiler: $CROSSCC64"])])
> +AS_IF([test "$HAVE_CROSSTEST" == "yes" -a "x$CROSSTARGET32" != "xno"], [AS_ECHO(["    Using 32-bit cross compiler: $CROSSCC32"])])
> +AS_IF([test "$HAVE_CROSSTEST" == "yes" -a "x$CROSSTARGET64" != "xno"], [AS_ECHO(["    Using 64-bit cross compiler: $CROSSCC64"])])
>   AS_ECHO([])



More information about the wine-devel mailing list