mirror of
https://github.com/mozilla/gecko-dev.git
synced 2025-01-27 07:34:20 +00:00
Make sure NSPR always builds with make and not make -jX (X > 1). NSPR cant
handle -jX builds because of the OBJDIR dependencies.
This commit is contained in:
parent
683ecef515
commit
2ed21cb951
@ -1 +1,7 @@
|
||||
DIST=@MOZ_NSPRENV_DIST@
|
||||
MOZ_NSPRENV_OVERRIDE_MAKE=@MOZ_NSPRENV_OVERRIDE_MAKE@
|
||||
|
||||
ifdef MOZ_NSPRENV_OVERRIDE_MAKE
|
||||
MAKE=$(MOZ_NSPRENV_OVERRIDE_MAKE)
|
||||
endif
|
||||
|
||||
|
16
configure.in
16
configure.in
@ -1832,6 +1832,21 @@ dnl Where the NSPR sutff gets installed: $DIST/{bin,lib,include}
|
||||
dnl
|
||||
MOZ_NSPRENV_DIST=`pwd`/dist
|
||||
|
||||
dnl
|
||||
dnl MAKE
|
||||
dnl
|
||||
dnl NSPR is not safe for gnu make -jX (where X > 1) builds. Force make
|
||||
dnl in NSPR to be 'make -j1' - or just 'make'
|
||||
dnl
|
||||
dnl Only set this if 'make' is found.
|
||||
|
||||
_make_try=`make -v 2> /dev/null`
|
||||
|
||||
if test "$_make_try"
|
||||
then
|
||||
MOZ_NSPRENV_OVERRIDE_MAKE=make
|
||||
fi
|
||||
|
||||
AC_SUBST(MOZ_NSPRENV_USE_PTHREADS)
|
||||
AC_SUBST(MOZ_NSPRENV_BUILD_OPT)
|
||||
AC_SUBST(MOZ_NSPRENV_NS_USE_GCC)
|
||||
@ -1839,6 +1854,7 @@ AC_SUBST(MOZ_NSPRENV_NO_MDUPDATE)
|
||||
AC_SUBST(MOZ_NSPRENV_NS_USE_NATIVE)
|
||||
AC_SUBST(MOZ_NSPRENV_MOZILLA_CLIENT)
|
||||
AC_SUBST(MOZ_NSPRENV_DIST)
|
||||
AC_SUBST(MOZ_NSPRENV_OVERRIDE_MAKE)
|
||||
fi
|
||||
dnl ========================================================
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user