diff options
| -rw-r--r-- | config_host.mk.in | 1 | ||||
| -rw-r--r-- | configure.ac | 5 |
2 files changed, 4 insertions, 2 deletions
diff --git a/config_host.mk.in b/config_host.mk.in index 13e5e906a3f6..d9528c25c0d2 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -425,6 +425,7 @@ export NASM=@NASM@ export NEON_CFLAGS=$(gb_SPACE)@NEON_CFLAGS@ export NEON_LIBS=$(gb_SPACE)@NEON_LIBS@ export NEON_VERSION=@NEON_VERSION@ +export NINJA=@NINJA@ export NM=@NM@ export NSS_CFLAGS=$(gb_SPACE)@NSS_CFLAGS@ export NSS_LIBS=$(gb_SPACE)@NSS_LIBS@ diff --git a/configure.ac b/configure.ac index ec8c92af30f6..5e20fc4d4271 100644 --- a/configure.ac +++ b/configure.ac @@ -9703,9 +9703,9 @@ for a in "$NINJA" ninja ninja-build; do $a --version > /dev/null 2>/dev/null if test $? -eq 0; then if test "$build_os" = "cygwin"; then - # nss requires the Windows version of ninja + # nss requires the Windows version of ninja (but uses its Unix path) if test -n "$($a -t list | grep 'msvc')" ; then - NINJA="$(cygpath -m "$(which "$(cygpath -u $a)")")" + NINJA=`which $a` fi else NINJA=`which $a` @@ -9724,6 +9724,7 @@ fi if test -z "$NINJA" -a "$nss_needs_ninja" = "yes" -a -n "$ENABLE_NSS" -a -z "$SYSTEM_NSS"; then AC_MSG_ERROR([Not found. NSS build requires Ninja (https://ninja-build.org/).]) fi +AC_SUBST(NINJA) dnl =================================================================== dnl Check for TLS/SSL and cryptographic implementation to use |