From 54fc6e181ee21acff1e1cd95668dac893924c332 Mon Sep 17 00:00:00 2001
From: Lu Qiuwen <luqiuwen@iie.ac.cn>
Date: Sun, 23 Sep 2018 21:13:28 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9MAKEFLAGS=E5=AE=9A=E4=B9=89?=
 =?UTF-8?q?=E7=9A=84=E4=BD=8D=E7=BD=AE=EF=BC=8C=E7=94=B1travis.sh=E5=8F=98?=
 =?UTF-8?q?=E6=9B=B4=E4=B8=BACMakeLists.txt=E4=B8=AD=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ci/travis.sh          |  6 +-----
 vendor/CMakeLists.txt | 11 ++++++++++-
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/ci/travis.sh b/ci/travis.sh
index 948c4dc..7e27d70 100644
--- a/ci/travis.sh
+++ b/ci/travis.sh
@@ -18,11 +18,6 @@ if [ $NPROCESSORS -gt 4 ] ; then
 	echo "$0:Note: Limiting processors to use by make from $NPROCESSORS to 4."
 	NPROCESSORS=4
 fi
-# Tell make to use the processors. No preceding '-' required.
-MAKEFLAGS="j${NPROCESSORS}"
-export MAKEFLAGS
-
-env | sort
 
 # Set default values to OFF for these variables if not specified.
 : "${NO_EXCEPTION:=OFF}"
@@ -35,6 +30,7 @@ export BUILD_TYPE=Debug
 
 cmake -DCMAKE_CXX_FLAGS=$CXX_FLAGS \
       -DCMAKE_BUILD_TYPE=$BUILD_TYPE \
+      -DTFE_BUILD_NPROCESSORS=$NPROCESSORS \
       ..
 make
 CTEST_OUTPUT_ON_FAILURE=1 make test
diff --git a/vendor/CMakeLists.txt b/vendor/CMakeLists.txt
index c949335..9f9ca9b 100644
--- a/vendor/CMakeLists.txt
+++ b/vendor/CMakeLists.txt
@@ -2,13 +2,18 @@
 
 include(ExternalProject)
 
+# NPROCESSOR, set by travis.sh
+if(TFE_BUILD_NPROCESSORS)
+set(ENV{MAKEFLAGS} "j${TFE_BUILD_NPROCESSORS}")
+endif()
+
 ### OpenSSL 1.1.0h
 ExternalProject_Add(OpenSSL PREFIX openssl
         URL ${CMAKE_CURRENT_SOURCE_DIR}/openssl-1.1.0h.tar.gz
         URL_MD5 5271477e4d93f4ea032b665ef095ff24
         CONFIGURE_COMMAND ./Configure linux-x86_64 --prefix=<INSTALL_DIR> --openssldir=<INSTALL_DIR>/lib/ssl
         no-weak-ssl-ciphers enable-ec_nistp_64_gcc_128 no-shared
-		BUILD_COMMAND make -j1
+		BUILD_COMMAND ${MAKE_COMMAND}
 		INSTALL_COMMAND make install_sw
         BUILD_IN_SOURCE 1)
 
@@ -196,3 +201,7 @@ file(MAKE_DIRECTORY ${INSTALL_DIR}/include)
 add_library(ctemplate-static STATIC IMPORTED GLOBAL)
 set_property(TARGET ctemplate-static PROPERTY IMPORTED_LOCATION ${INSTALL_DIR}/lib/libctemplate.a)
 set_property(TARGET ctemplate-static PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${INSTALL_DIR}/include)
+
+if(TFE_BUILD_NPROCESSORS)
+	set(ENV{MAKEFLAGS} "")
+endif()