[arrow] branch master updated: ARROW-2827: [C++] Stop to use -jN in sub make

[we...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

wesm pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/arrow.git


The following commit(s) were added to refs/heads/master by this push:
     new 7a413fe  ARROW-2827: [C++] Stop to use -jN in sub make
7a413fe is described below

commit 7a413fe029d0295b6eef8069331e1fda44195e42
Author: Kouhei Sutou <ko...@clear-code.com>
AuthorDate: Tue Jul 10 22:17:48 2018 -0400

    ARROW-2827: [C++] Stop to use -jN in sub make
    
    It may break parallel build in some cases such as building deb
    packages case.
    
    Author: Kouhei Sutou <ko...@clear-code.com>
    
    Closes #2245 from kou/cpp-stop-to-use-j-in-sub-make and squashes the following commits:
    
    df3d68c6 <Kouhei Sutou>  Stop to use -jN in sub make
---
 cpp/build-support/build-lz4-lib.sh  | 6 +++++-
 cpp/build-support/build-zstd-lib.sh | 6 +++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/cpp/build-support/build-lz4-lib.sh b/cpp/build-support/build-lz4-lib.sh
index 8cb5c18..d336866 100755
--- a/cpp/build-support/build-lz4-lib.sh
+++ b/cpp/build-support/build-lz4-lib.sh
@@ -18,4 +18,8 @@
 # under the License.
 #
 export CFLAGS="${CFLAGS} -O3 -fPIC"
-make -j4
+if [ -z "$MAKELEVEL" ]; then
+  make -j4
+else
+  make
+fi
diff --git a/cpp/build-support/build-zstd-lib.sh b/cpp/build-support/build-zstd-lib.sh
index 8cb5c18..d336866 100755
--- a/cpp/build-support/build-zstd-lib.sh
+++ b/cpp/build-support/build-zstd-lib.sh
@@ -18,4 +18,8 @@
 # under the License.
 #
 export CFLAGS="${CFLAGS} -O3 -fPIC"
-make -j4
+if [ -z "$MAKELEVEL" ]; then
+  make -j4
+else
+  make
+fi