summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYonghong Zhu <yonghong.zhu@intel.com>2018-02-05 14:14:07 +0800
committerYonghong Zhu <yonghong.zhu@intel.com>2018-02-09 08:33:46 +0800
commit2052cb675f1fdbc77f916422fdf5c2da29741169 (patch)
tree1fc9a12679ff5b77654fe774ab6ca6bc0ac747ba
parentc0d221a348543a4b296a64239826090a167b16ed (diff)
downloadedk2-2052cb675f1fdbc77f916422fdf5c2da29741169.tar.gz
edk2-2052cb675f1fdbc77f916422fdf5c2da29741169.tar.bz2
edk2-2052cb675f1fdbc77f916422fdf5c2da29741169.zip
BaseTools: not specified value of MAX_CONCURRENT_THREAD_NUMBER
when MAX_CONCURRENT_THREAD_NUMBER is not specified, tool will automatically detect number of processor threads. Fixes: https://bugzilla.tianocore.org/show_bug.cgi?id=775 Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Yonghong Zhu <yonghong.zhu@intel.com> Reviewed-by: Liming Gao <liming.gao@intel.com>
-rw-r--r--BaseTools/Conf/target.template14
-rw-r--r--BaseTools/Source/Python/build/build.py3
2 files changed, 11 insertions, 6 deletions
diff --git a/BaseTools/Conf/target.template b/BaseTools/Conf/target.template
index 787fc64fb1..e5c31fe5a0 100644
--- a/BaseTools/Conf/target.template
+++ b/BaseTools/Conf/target.template
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
#
# This program and the accompanying materials
# are licensed and made available under the terms and conditions of the BSD License
@@ -59,10 +59,14 @@ TOOL_CHAIN_CONF = Conf/tools_def.txt
# used for the build. The list uses space character separation.
TOOL_CHAIN_TAG = MYTOOLS
-# MAX_CONCURRENT_THREAD_NUMBER NUMBER Optional The number of concurrent threads. Recommend to set this
-# value to one more than the number of your compurter
-# cores or CPUs. Less than 2 means disable multithread build.
-MAX_CONCURRENT_THREAD_NUMBER = 1
+# MAX_CONCURRENT_THREAD_NUMBER NUMBER Optional The number of concurrent threads. If not specified or set
+# to zero, tool automatically detect number of processor
+# threads. Recommend to set this value to one less than the
+# number of your computer cores or CPUs. When value set to 1,
+# means disable multi-thread build, value set to more than 1,
+# means user specify the thread number to build. Not specify
+# the default value in this file.
+# MAX_CONCURRENT_THREAD_NUMBER = 1
# BUILD_RULE_CONF Filename Optional Specify the file name to use for the build rules that are followed
diff --git a/BaseTools/Source/Python/build/build.py b/BaseTools/Source/Python/build/build.py
index 24f9962c9d..14a2ceb4bc 100644
--- a/BaseTools/Source/Python/build/build.py
+++ b/BaseTools/Source/Python/build/build.py
@@ -2323,7 +2323,8 @@ def MyOptionParser():
help="Using this name of SKU ID to build the platform, overriding SKUID_IDENTIFIER in DSC file.")
Parser.add_option("-n", action="callback", type="int", dest="ThreadNumber", callback=SingleCheckCallback,
- help="Build the platform using multi-threaded compiler. The value overrides target.txt's MAX_CONCURRENT_THREAD_NUMBER. Less than 2 will disable multi-thread builds.")
+ help="Build the platform using multi-threaded compiler. The value overrides target.txt's MAX_CONCURRENT_THREAD_NUMBER. When value is set to 0, tool automatically detect number of "\
+ "processor threads, set value to 1 means disable multi-thread build, and set value to more than 1 means user specify the threads number to build.")
Parser.add_option("-f", "--fdf", action="callback", type="string", dest="FdfFile", callback=SingleCheckCallback,
help="The name of the FDF file to use, which overrides the setting in the DSC file.")