Merge remote-tracking branch 'origin/tracking' into custom

This commit is contained in:
roytam1 2023-11-10 15:33:35 +08:00
commit dd337fad41
4 changed files with 27 additions and 1 deletions

View file

@ -5579,7 +5579,14 @@ ac_configure_args="$_SUBDIR_CONFIG_ARGS"
# --with-system-nspr will have been converted into the relevant $NSPR_CFLAGS
# and $NSPR_LIBS.
ac_configure_args="`echo $ac_configure_args | sed -e 's/--with-system-nspr\S* *//'`"
case "${OS_TARGET}" in
Darwin|DragonFly|FreeBSD|NetBSD|OpenBSD)
ac_configure_args="`echo $ac_configure_args | sed -e 's/--with-system-nspr[^[:space:]]* *//'`"
;;
*)
ac_configure_args="`echo $ac_configure_args | ${TOOLCHAIN_PREFIX}sed -e 's/--with-system-nspr\S* *//'`"
;;
esac
if test -n "$NSPR_CFLAGS" -o -n "$NSPR_LIBS"; then
ac_configure_args="$ac_configure_args --with-nspr-cflags='$NSPR_CFLAGS'"