Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make sure NSPR always builds with make and not make -jX (X > 1). NSPR cant

Browse Source 
handle -jX builds because of the OBJDIR dependencies.


git-svn-id: svn://10.0.0.236/trunk@27798 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
ramiro%netscape.com 1999-04-16 02:39:00 +00:00
parent c7b4dc7cff
commit bfbca9e7fb
2 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mozilla/build/unix/nspr_my_overrides.mk.in
View File

@ -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
mozilla/configure.in
View File

@ -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 ========================================================