commit 827e5d9009e1073a978e267f649c5054fb4a443c Author: Sukhbir Singh sukhbir@torproject.org Date: Thu Jul 2 02:21:41 2015 -0400

Do not set MOZ_MAKE_FLAGS (-j)

We set this flag earlier to enable parallel compilation but the documentation says that the build system will automatically configure the -j flag based on the CPU cores it needs. --- projects/instantbird/mozconfig-linux-i686 | 3 --- projects/instantbird/mozconfig-linux-x86_64 | 3 --- projects/instantbird/mozconfig-osx-x86_64 | 3 --- projects/instantbird/mozconfig-windows-i686 | 3 --- 4 files changed, 12 deletions(-)

diff --git a/projects/instantbird/mozconfig-linux-i686 b/projects/instantbird/mozconfig-linux-i686 index b7fe30a..e65b880 100644 --- a/projects/instantbird/mozconfig-linux-i686 +++ b/projects/instantbird/mozconfig-linux-i686 @@ -10,9 +10,6 @@ export ASFLAGS=-m32 export MOZ_DEBUG_SYMBOLS=1 ac_add_options --enable-debug-symbols="-gdwarf-2"

-CONCURRENCY=$(( `grep processor /proc/cpuinfo | wc -l` + 2 )) -mk_add_options MOZ_MAKE_FLAGS="-j$CONCURRENCY" - ac_add_options --with-ccache ac_add_options --enable-application=im ac_add_options --enable-optimize diff --git a/projects/instantbird/mozconfig-linux-x86_64 b/projects/instantbird/mozconfig-linux-x86_64 index 3953e7f..974156e 100644 --- a/projects/instantbird/mozconfig-linux-x86_64 +++ b/projects/instantbird/mozconfig-linux-x86_64 @@ -7,9 +7,6 @@ export CXXFLAGS="-gdwarf-2" export MOZ_DEBUG_SYMBOLS=1 ac_add_options --enable-debug-symbols="-gdwarf-2"

-CONCURRENCY=$(( `grep processor /proc/cpuinfo | wc -l` + 2 )) -mk_add_options MOZ_MAKE_FLAGS="-j$CONCURRENCY" - ac_add_options --with-ccache ac_add_options --enable-application=im ac_add_options --enable-optimize diff --git a/projects/instantbird/mozconfig-osx-x86_64 b/projects/instantbird/mozconfig-osx-x86_64 index 4561ee1..1f999cd 100644 --- a/projects/instantbird/mozconfig-osx-x86_64 +++ b/projects/instantbird/mozconfig-osx-x86_64 @@ -9,9 +9,6 @@ FLAGS="-arch x86_64 -isysroot $sysrootdir" CC="$ccbindir/x86_64-apple-darwin10-clang $FLAGS" CXX="$ccbindir/x86_64-apple-darwin10-clang++ $FLAGS"

-CONCURRENCY=$(( `grep processor /proc/cpuinfo | wc -l` + 2 )) -mk_add_options MOZ_MAKE_FLAGS="-j$CONCURRENCY" - ac_add_options --enable-application=im ac_add_options --enable-optimize ac_add_options --target=x86_64-apple-darwin10 diff --git a/projects/instantbird/mozconfig-windows-i686 b/projects/instantbird/mozconfig-windows-i686 index 72b5a9a..52b9e85 100644 --- a/projects/instantbird/mozconfig-windows-i686 +++ b/projects/instantbird/mozconfig-windows-i686 @@ -6,9 +6,6 @@ ac_add_options --target=i686-w64-mingw32 ac_add_options --enable-default-toolkit=cairo-windows ac_add_options --enable-strip

-CONCURRENCY=$(( `grep processor /proc/cpuinfo | wc -l` + 2 )) -mk_add_options MOZ_MAKE_FLAGS="-j$CONCURRENCY" - ac_add_options --enable-application=im ac_add_options --enable-optimize