From 2eab98c10703872dc125fa641da82acbf99b947d Mon Sep 17 00:00:00 2001 From: jwang36 Date: Wed, 31 Dec 2008 05:53:26 +0000 Subject: 1) Re-fine and fully test the mechanism of getting over the long command line limitation 2) Change the -s option from "SpawnMode" to be "SilentMode" 3) Change the prototype of PeiCoreEntryPoint in AutoGen-ed code 4) Remove CalcDeps module since it's no longer needed. 5) Remove "-k", "-g" and "-l" switches from build 6) Remove MULTIPLE_THREAD in target.template. Use MAX_CONCURRENT_THREAD_NUMBER to get the functionality. git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@7158 6f19259b-4bc3-4df7-8a09-765794883524 --- BaseTools/Bin/Win32/GenFds.exe | Bin 1396455 -> 1403499 bytes BaseTools/Bin/Win32/build.exe | Bin 1957181 -> 1960286 bytes BaseTools/Conf/build_rule.template | 7 +++---- BaseTools/Conf/target.template | 14 +++----------- 4 files changed, 6 insertions(+), 15 deletions(-) diff --git a/BaseTools/Bin/Win32/GenFds.exe b/BaseTools/Bin/Win32/GenFds.exe index 93ab585c4e..01d175fd88 100755 Binary files a/BaseTools/Bin/Win32/GenFds.exe and b/BaseTools/Bin/Win32/GenFds.exe differ diff --git a/BaseTools/Bin/Win32/build.exe b/BaseTools/Bin/Win32/build.exe index 6ccb242549..73148ee602 100755 Binary files a/BaseTools/Bin/Win32/build.exe and b/BaseTools/Bin/Win32/build.exe differ diff --git a/BaseTools/Conf/build_rule.template b/BaseTools/Conf/build_rule.template index 4f68ddc6c1..d3b8e7ccc3 100644 --- a/BaseTools/Conf/build_rule.template +++ b/BaseTools/Conf/build_rule.template @@ -200,20 +200,19 @@ [Static-Library-File] - ?.lib + *.lib - $(LIBS) $(MAKE_FILE) $(DEBUG_DIR)(+)$(MODULE_NAME).dll - "$(DLINK)" /OUT:${dst} $(DLINK_FLAGS) $(DLINK_SPATH) $(LIBS) ${src} + "$(DLINK)" /OUT:${dst} $(DLINK_FLAGS) $(DLINK_SPATH) ${src} - "$(DLINK)" -o ${dst} $(DLINK_FLAGS) -\( $(DLINK_SPATH) $(LIBS) ${src} -\) $(DLINK2_FLAGS) + "$(DLINK)" -o ${dst} $(DLINK_FLAGS) -\( $(DLINK_SPATH) ${src} -\) $(DLINK2_FLAGS) [Dynamic-Library-File] diff --git a/BaseTools/Conf/target.template b/BaseTools/Conf/target.template index 5623e7b303..5ce56d3fe8 100644 --- a/BaseTools/Conf/target.template +++ b/BaseTools/Conf/target.template @@ -58,17 +58,9 @@ TOOL_CHAIN_CONF = Conf/tools_def.txt # used for the build. The list uses space character separation. TOOL_CHAIN_TAG = MYTOOLS -# MULTIPLE_THREAD FLAG Optional Flag to enable multi-thread build. If not specified, default -# is "Disable". If your computer is multi-core or multiple CPUs, -# enabling this feature will bring much benefit. -# This feature is only available for "spawn" build mode, and -# only for PLATFORM build. The clean, cleanall or -# stand-alone module build is still using the normal way. -MULTIPLE_THREAD = Enable - -# MAX_CONCURRENT_THREAD_NUMBER NUMBER Optional The number of concurrent threads. Default is 1. Recommend to -# set this value to one more than the number of your compurter -# cores or CPUs. +# 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 # Build rules definition -- cgit v1.2.3