[Patch 1/1] BaseTools/Conf: Fix MAKE_FLAGS typos in tools

public inbox for devel@edk2.groups.io
 help / color / mirror / Atom feed

* [Patch 1/1] BaseTools/Conf: Fix MAKE_FLAGS typos in tools_def.template
@ 2021-04-09 22:00 Michael D Kinney
  2021-04-12  1:32 ` 回复: " gaoliming
                   ` (2 more replies)
  0 siblings, 3 replies; 5+ messages in thread
From: Michael D Kinney @ 2021-04-09 22:00 UTC (permalink / raw)
  To: devel; +Cc: Bob Feng, Liming Gao, Yuwei Chen

REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3313

Change MAKE_FLAG to MAKE_FLAGS to match required name from
EDK II Build Specifications for VS20xx tool chains.

Cc: Bob Feng <bob.c.feng@intel.com>
Cc: Liming Gao <gaoliming@byosoft.com.cn>
Cc: Yuwei Chen <yuwei.chen@intel.com>
Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
---
 BaseTools/Conf/tools_def.template | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/BaseTools/Conf/tools_def.template b/BaseTools/Conf/tools_def.template
index 933b3160fd2b..c6c9edf5a0d7 100755
--- a/BaseTools/Conf/tools_def.template
+++ b/BaseTools/Conf/tools_def.template
@@ -1,5 +1,5 @@
 #
-#  Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
+#  Copyright (c) 2006 - 2021, Intel Corporation. All rights reserved.<BR>
 #  Portions copyright (c) 2008 - 2009, Apple Inc. All rights reserved.<BR>
 #  Portions copyright (c) 2011 - 2019, ARM Ltd. All rights reserved.<BR>
 #  Copyright (c) 2015, Hewlett-Packard Development Company, L.P.<BR>
@@ -531,7 +531,7 @@ NOOPT_VS2008_X64_DLINK_FLAGS  = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT
 *_VS2008x86_*_*_FAMILY        = MSFT
 
 *_VS2008x86_*_MAKE_PATH       = DEF(VS2008x86_BIN)\nmake.exe
-*_VS2008x86_*_MAKE_FLAG       = /nologo
+*_VS2008x86_*_MAKE_FLAGS      = /nologo
 *_VS2008x86_*_RC_PATH         = DEF(WINSDK_BIN)\rc.exe
 
 *_VS2008x86_*_MAKE_FLAGS      = /nologo
@@ -765,7 +765,7 @@ NOOPT_VS2010_X64_DLINK_FLAGS  = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT
 *_VS2010x86_*_*_FAMILY        = MSFT
 
 *_VS2010x86_*_MAKE_PATH       = DEF(VS2010x86_BIN)\nmake.exe
-*_VS2010x86_*_MAKE_FLAG       = /nologo
+*_VS2010x86_*_MAKE_FLAGS      = /nologo
 *_VS2010x86_*_RC_PATH         = DEF(WINSDK7x86_BIN)\rc.exe
 
 *_VS2010x86_*_MAKE_FLAGS      = /nologo
@@ -999,7 +999,7 @@ NOOPT_VS2012_X64_DLINK_FLAGS  = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT
 *_VS2012x86_*_*_FAMILY        = MSFT
 
 *_VS2012x86_*_MAKE_PATH       = DEF(VS2012x86_BIN)\nmake.exe
-*_VS2012x86_*_MAKE_FLAG       = /nologo
+*_VS2012x86_*_MAKE_FLAGS      = /nologo
 *_VS2012x86_*_RC_PATH         = DEF(WINSDK71x86_BIN)\rc.exe
 
 *_VS2012x86_*_MAKE_FLAGS      = /nologo
@@ -1233,7 +1233,7 @@ NOOPT_VS2013_X64_DLINK_FLAGS  = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT
 *_VS2013x86_*_*_FAMILY        = MSFT
 
 *_VS2013x86_*_MAKE_PATH       = DEF(VS2013x86_BIN)\nmake.exe
-*_VS2013x86_*_MAKE_FLAG       = /nologo
+*_VS2013x86_*_MAKE_FLAGS      = /nologo
 *_VS2013x86_*_RC_PATH         = DEF(WINSDK8x86_BIN)\rc.exe
 
 *_VS2013x86_*_MAKE_FLAGS      = /nologo
@@ -1468,7 +1468,7 @@ NOOPT_VS2015_X64_DLINK_FLAGS  = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT
 *_VS2015x86_*_*_FAMILY        = MSFT
 
 *_VS2015x86_*_MAKE_PATH       = DEF(VS2015x86_BIN)\nmake.exe
-*_VS2015x86_*_MAKE_FLAG       = /nologo
+*_VS2015x86_*_MAKE_FLAGS      = /nologo
 *_VS2015x86_*_RC_PATH         = DEF(WINSDK81x86_BIN)\rc.exe
 
 *_VS2015x86_*_MAKE_FLAGS      = /nologo
@@ -1586,7 +1586,7 @@ NOOPT_VS2015x86_X64_DLINK_FLAGS    = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF
 *_VS2017_*_*_DLL           = DEF(VS2017_BIN_HOST)
 
 *_VS2017_*_MAKE_PATH       = DEF(VS2017_BIN_HOST)\nmake.exe
-*_VS2017_*_MAKE_FLAG       = /nologo
+*_VS2017_*_MAKE_FLAGS      = /nologo
 *_VS2017_*_RC_PATH         = DEF(RC_PATH)
 
 *_VS2017_*_MAKE_FLAGS      = /nologo
@@ -1749,7 +1749,7 @@ NOOPT_VS2017_AARCH64_DLINK_FLAGS   = /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF
 *_VS2019_*_*_DLL           = DEF(VS2019_BIN_HOST)
 
 *_VS2019_*_MAKE_PATH       = DEF(VS2019_BIN_HOST)\nmake.exe
-*_VS2019_*_MAKE_FLAG       = /nologo
+*_VS2019_*_MAKE_FLAGS      = /nologo
 *_VS2019_*_RC_PATH         = DEF(RC_PATH)
 
 *_VS2019_*_MAKE_FLAGS      = /nologo
-- 
2.31.1.windows.1


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* 回复: [Patch 1/1] BaseTools/Conf: Fix MAKE_FLAGS typos in tools_def.template
  2021-04-09 22:00 [Patch 1/1] BaseTools/Conf: Fix MAKE_FLAGS typos in tools_def.template Michael D Kinney
@ 2021-04-12  1:32 ` gaoliming
  2021-04-12  1:48 ` Yuwei Chen
       [not found] ` <1674F9256FCB7012.19371@groups.io>
  2 siblings, 0 replies; 5+ messages in thread
From: gaoliming @ 2021-04-12  1:32 UTC (permalink / raw)
  To: 'Michael D Kinney', devel
  Cc: 'Bob Feng', 'Yuwei Chen'

Reviewed-by: Liming Gao <gaoliming@byosoft.com.cn>

> -----邮件原件-----
> 发件人: Michael D Kinney <michael.d.kinney@intel.com>
> 发送时间: 2021年4月10日 6:00
> 收件人: devel@edk2.groups.io
> 抄送: Bob Feng <bob.c.feng@intel.com>; Liming Gao
> <gaoliming@byosoft.com.cn>; Yuwei Chen <yuwei.chen@intel.com>
> 主题: [Patch 1/1] BaseTools/Conf: Fix MAKE_FLAGS typos in
> tools_def.template
> 
> REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3313
> 
> Change MAKE_FLAG to MAKE_FLAGS to match required name from
> EDK II Build Specifications for VS20xx tool chains.
> 
> Cc: Bob Feng <bob.c.feng@intel.com>
> Cc: Liming Gao <gaoliming@byosoft.com.cn>
> Cc: Yuwei Chen <yuwei.chen@intel.com>
> Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
> ---
>  BaseTools/Conf/tools_def.template | 16 ++++++++--------
>  1 file changed, 8 insertions(+), 8 deletions(-)
> 
> diff --git a/BaseTools/Conf/tools_def.template
> b/BaseTools/Conf/tools_def.template
> index 933b3160fd2b..c6c9edf5a0d7 100755
> --- a/BaseTools/Conf/tools_def.template
> +++ b/BaseTools/Conf/tools_def.template
> @@ -1,5 +1,5 @@
>  #
> -#  Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
> +#  Copyright (c) 2006 - 2021, Intel Corporation. All rights reserved.<BR>
>  #  Portions copyright (c) 2008 - 2009, Apple Inc. All rights
reserved.<BR>
>  #  Portions copyright (c) 2011 - 2019, ARM Ltd. All rights reserved.<BR>
>  #  Copyright (c) 2015, Hewlett-Packard Development Company, L.P.<BR>
> @@ -531,7 +531,7 @@ NOOPT_VS2008_X64_DLINK_FLAGS  = /NOLOGO
> /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT
>  *_VS2008x86_*_*_FAMILY        = MSFT
> 
>  *_VS2008x86_*_MAKE_PATH       = DEF(VS2008x86_BIN)\nmake.exe
> -*_VS2008x86_*_MAKE_FLAG       = /nologo
> +*_VS2008x86_*_MAKE_FLAGS      = /nologo
>  *_VS2008x86_*_RC_PATH         = DEF(WINSDK_BIN)\rc.exe
> 
>  *_VS2008x86_*_MAKE_FLAGS      = /nologo
> @@ -765,7 +765,7 @@ NOOPT_VS2010_X64_DLINK_FLAGS  = /NOLOGO
> /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT
>  *_VS2010x86_*_*_FAMILY        = MSFT
> 
>  *_VS2010x86_*_MAKE_PATH       = DEF(VS2010x86_BIN)\nmake.exe
> -*_VS2010x86_*_MAKE_FLAG       = /nologo
> +*_VS2010x86_*_MAKE_FLAGS      = /nologo
>  *_VS2010x86_*_RC_PATH         = DEF(WINSDK7x86_BIN)\rc.exe
> 
>  *_VS2010x86_*_MAKE_FLAGS      = /nologo
> @@ -999,7 +999,7 @@ NOOPT_VS2012_X64_DLINK_FLAGS  = /NOLOGO
> /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT
>  *_VS2012x86_*_*_FAMILY        = MSFT
> 
>  *_VS2012x86_*_MAKE_PATH       = DEF(VS2012x86_BIN)\nmake.exe
> -*_VS2012x86_*_MAKE_FLAG       = /nologo
> +*_VS2012x86_*_MAKE_FLAGS      = /nologo
>  *_VS2012x86_*_RC_PATH         = DEF(WINSDK71x86_BIN)\rc.exe
> 
>  *_VS2012x86_*_MAKE_FLAGS      = /nologo
> @@ -1233,7 +1233,7 @@ NOOPT_VS2013_X64_DLINK_FLAGS  = /NOLOGO
> /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT
>  *_VS2013x86_*_*_FAMILY        = MSFT
> 
>  *_VS2013x86_*_MAKE_PATH       = DEF(VS2013x86_BIN)\nmake.exe
> -*_VS2013x86_*_MAKE_FLAG       = /nologo
> +*_VS2013x86_*_MAKE_FLAGS      = /nologo
>  *_VS2013x86_*_RC_PATH         = DEF(WINSDK8x86_BIN)\rc.exe
> 
>  *_VS2013x86_*_MAKE_FLAGS      = /nologo
> @@ -1468,7 +1468,7 @@ NOOPT_VS2015_X64_DLINK_FLAGS  = /NOLOGO
> /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT
>  *_VS2015x86_*_*_FAMILY        = MSFT
> 
>  *_VS2015x86_*_MAKE_PATH       = DEF(VS2015x86_BIN)\nmake.exe
> -*_VS2015x86_*_MAKE_FLAG       = /nologo
> +*_VS2015x86_*_MAKE_FLAGS      = /nologo
>  *_VS2015x86_*_RC_PATH         = DEF(WINSDK81x86_BIN)\rc.exe
> 
>  *_VS2015x86_*_MAKE_FLAGS      = /nologo
> @@ -1586,7 +1586,7 @@ NOOPT_VS2015x86_X64_DLINK_FLAGS    =
> /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF
>  *_VS2017_*_*_DLL           = DEF(VS2017_BIN_HOST)
> 
>  *_VS2017_*_MAKE_PATH       = DEF(VS2017_BIN_HOST)\nmake.exe
> -*_VS2017_*_MAKE_FLAG       = /nologo
> +*_VS2017_*_MAKE_FLAGS      = /nologo
>  *_VS2017_*_RC_PATH         = DEF(RC_PATH)
> 
>  *_VS2017_*_MAKE_FLAGS      = /nologo
> @@ -1749,7 +1749,7 @@ NOOPT_VS2017_AARCH64_DLINK_FLAGS   =
> /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF
>  *_VS2019_*_*_DLL           = DEF(VS2019_BIN_HOST)
> 
>  *_VS2019_*_MAKE_PATH       = DEF(VS2019_BIN_HOST)\nmake.exe
> -*_VS2019_*_MAKE_FLAG       = /nologo
> +*_VS2019_*_MAKE_FLAGS      = /nologo
>  *_VS2019_*_RC_PATH         = DEF(RC_PATH)
> 
>  *_VS2019_*_MAKE_FLAGS      = /nologo
> --
> 2.31.1.windows.1




^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [Patch 1/1] BaseTools/Conf: Fix MAKE_FLAGS typos in tools_def.template
  2021-04-09 22:00 [Patch 1/1] BaseTools/Conf: Fix MAKE_FLAGS typos in tools_def.template Michael D Kinney
  2021-04-12  1:32 ` 回复: " gaoliming
@ 2021-04-12  1:48 ` Yuwei Chen
       [not found] ` <1674F9256FCB7012.19371@groups.io>
  2 siblings, 0 replies; 5+ messages in thread
From: Yuwei Chen @ 2021-04-12  1:48 UTC (permalink / raw)
  To: Kinney, Michael D, devel@edk2.groups.io; +Cc: Feng, Bob C, Liming Gao

Reviewed-by: Yuwei Chen<yuwei.chen@intel.com>

> -----Original Message-----
> From: Kinney, Michael D <michael.d.kinney@intel.com>
> Sent: Saturday, April 10, 2021 6:00 AM
> To: devel@edk2.groups.io
> Cc: Feng, Bob C <bob.c.feng@intel.com>; Liming Gao
> <gaoliming@byosoft.com.cn>; Chen, Christine <yuwei.chen@intel.com>
> Subject: [Patch 1/1] BaseTools/Conf: Fix MAKE_FLAGS typos in
> tools_def.template
> 
> REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3313
> 
> Change MAKE_FLAG to MAKE_FLAGS to match required name from EDK II
> Build Specifications for VS20xx tool chains.
> 
> Cc: Bob Feng <bob.c.feng@intel.com>
> Cc: Liming Gao <gaoliming@byosoft.com.cn>
> Cc: Yuwei Chen <yuwei.chen@intel.com>
> Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
> ---
>  BaseTools/Conf/tools_def.template | 16 ++++++++--------
>  1 file changed, 8 insertions(+), 8 deletions(-)
> 
> diff --git a/BaseTools/Conf/tools_def.template
> b/BaseTools/Conf/tools_def.template
> index 933b3160fd2b..c6c9edf5a0d7 100755
> --- a/BaseTools/Conf/tools_def.template
> +++ b/BaseTools/Conf/tools_def.template
> @@ -1,5 +1,5 @@
>  #
> -#  Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>
> +#  Copyright (c) 2006 - 2021, Intel Corporation. All rights
> +reserved.<BR>
>  #  Portions copyright (c) 2008 - 2009, Apple Inc. All rights reserved.<BR>  #
> Portions copyright (c) 2011 - 2019, ARM Ltd. All rights reserved.<BR>  #
> Copyright (c) 2015, Hewlett-Packard Development Company, L.P.<BR> @@ -
> 531,7 +531,7 @@ NOOPT_VS2008_X64_DLINK_FLAGS  = /NOLOGO
> /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT
>  *_VS2008x86_*_*_FAMILY        = MSFT
> 
>  *_VS2008x86_*_MAKE_PATH       = DEF(VS2008x86_BIN)\nmake.exe
> -*_VS2008x86_*_MAKE_FLAG       = /nologo
> +*_VS2008x86_*_MAKE_FLAGS      = /nologo
>  *_VS2008x86_*_RC_PATH         = DEF(WINSDK_BIN)\rc.exe
> 
>  *_VS2008x86_*_MAKE_FLAGS      = /nologo
> @@ -765,7 +765,7 @@ NOOPT_VS2010_X64_DLINK_FLAGS  = /NOLOGO
> /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT
>  *_VS2010x86_*_*_FAMILY        = MSFT
> 
>  *_VS2010x86_*_MAKE_PATH       = DEF(VS2010x86_BIN)\nmake.exe
> -*_VS2010x86_*_MAKE_FLAG       = /nologo
> +*_VS2010x86_*_MAKE_FLAGS      = /nologo
>  *_VS2010x86_*_RC_PATH         = DEF(WINSDK7x86_BIN)\rc.exe
> 
>  *_VS2010x86_*_MAKE_FLAGS      = /nologo
> @@ -999,7 +999,7 @@ NOOPT_VS2012_X64_DLINK_FLAGS  = /NOLOGO
> /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT
>  *_VS2012x86_*_*_FAMILY        = MSFT
> 
>  *_VS2012x86_*_MAKE_PATH       = DEF(VS2012x86_BIN)\nmake.exe
> -*_VS2012x86_*_MAKE_FLAG       = /nologo
> +*_VS2012x86_*_MAKE_FLAGS      = /nologo
>  *_VS2012x86_*_RC_PATH         = DEF(WINSDK71x86_BIN)\rc.exe
> 
>  *_VS2012x86_*_MAKE_FLAGS      = /nologo
> @@ -1233,7 +1233,7 @@ NOOPT_VS2013_X64_DLINK_FLAGS  = /NOLOGO
> /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT
>  *_VS2013x86_*_*_FAMILY        = MSFT
> 
>  *_VS2013x86_*_MAKE_PATH       = DEF(VS2013x86_BIN)\nmake.exe
> -*_VS2013x86_*_MAKE_FLAG       = /nologo
> +*_VS2013x86_*_MAKE_FLAGS      = /nologo
>  *_VS2013x86_*_RC_PATH         = DEF(WINSDK8x86_BIN)\rc.exe
> 
>  *_VS2013x86_*_MAKE_FLAGS      = /nologo
> @@ -1468,7 +1468,7 @@ NOOPT_VS2015_X64_DLINK_FLAGS  = /NOLOGO
> /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT
>  *_VS2015x86_*_*_FAMILY        = MSFT
> 
>  *_VS2015x86_*_MAKE_PATH       = DEF(VS2015x86_BIN)\nmake.exe
> -*_VS2015x86_*_MAKE_FLAG       = /nologo
> +*_VS2015x86_*_MAKE_FLAGS      = /nologo
>  *_VS2015x86_*_RC_PATH         = DEF(WINSDK81x86_BIN)\rc.exe
> 
>  *_VS2015x86_*_MAKE_FLAGS      = /nologo
> @@ -1586,7 +1586,7 @@ NOOPT_VS2015x86_X64_DLINK_FLAGS    =
> /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF
>  *_VS2017_*_*_DLL           = DEF(VS2017_BIN_HOST)
> 
>  *_VS2017_*_MAKE_PATH       = DEF(VS2017_BIN_HOST)\nmake.exe
> -*_VS2017_*_MAKE_FLAG       = /nologo
> +*_VS2017_*_MAKE_FLAGS      = /nologo
>  *_VS2017_*_RC_PATH         = DEF(RC_PATH)
> 
>  *_VS2017_*_MAKE_FLAGS      = /nologo
> @@ -1749,7 +1749,7 @@ NOOPT_VS2017_AARCH64_DLINK_FLAGS   =
> /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF
>  *_VS2019_*_*_DLL           = DEF(VS2019_BIN_HOST)
> 
>  *_VS2019_*_MAKE_PATH       = DEF(VS2019_BIN_HOST)\nmake.exe
> -*_VS2019_*_MAKE_FLAG       = /nologo
> +*_VS2019_*_MAKE_FLAGS      = /nologo
>  *_VS2019_*_RC_PATH         = DEF(RC_PATH)
> 
>  *_VS2019_*_MAKE_FLAGS      = /nologo
> --
> 2.31.1.windows.1


^ permalink raw reply	[flat|nested] 5+ messages in thread

[parent not found: <1674F9256FCB7012.19371@groups.io>]

* Re: [edk2-devel] [Patch 1/1] BaseTools/Conf: Fix MAKE_FLAGS typos in tools_def.template
       [not found] ` <1674F9256FCB7012.19371@groups.io>
@ 2021-04-13  7:39   ` Yuwei Chen
  2021-04-13 14:17     ` Michael D Kinney
  0 siblings, 1 reply; 5+ messages in thread
From: Yuwei Chen @ 2021-04-13  7:39 UTC (permalink / raw)
  To: devel@edk2.groups.io, Chen, Christine, Kinney, Michael D
  Cc: Feng, Bob C, Liming Gao

Hi Mike,

I have a minor comment. As you change the '*_MAKE_FLAG' to '*_MAKE_FLAGS',   there will have two same '*_MAKE_FLAGS' for the tool chain. It may be duplicated. Would it be better if just delete "* _MAKE_FLAG"?

Thanks,
Christine

> -----Original Message-----
> From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Yuwei
> Chen
> Sent: Monday, April 12, 2021 9:48 AM
> To: Kinney, Michael D <michael.d.kinney@intel.com>; devel@edk2.groups.io
> Cc: Feng, Bob C <bob.c.feng@intel.com>; Liming Gao
> <gaoliming@byosoft.com.cn>
> Subject: Re: [edk2-devel] [Patch 1/1] BaseTools/Conf: Fix MAKE_FLAGS typos
> in tools_def.template
> 
> Reviewed-by: Yuwei Chen<yuwei.chen@intel.com>
> 
> > -----Original Message-----
> > From: Kinney, Michael D <michael.d.kinney@intel.com>
> > Sent: Saturday, April 10, 2021 6:00 AM
> > To: devel@edk2.groups.io
> > Cc: Feng, Bob C <bob.c.feng@intel.com>; Liming Gao
> > <gaoliming@byosoft.com.cn>; Chen, Christine <yuwei.chen@intel.com>
> > Subject: [Patch 1/1] BaseTools/Conf: Fix MAKE_FLAGS typos in
> > tools_def.template
> >
> > REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3313
> >
> > Change MAKE_FLAG to MAKE_FLAGS to match required name from EDK II
> > Build Specifications for VS20xx tool chains.
> >
> > Cc: Bob Feng <bob.c.feng@intel.com>
> > Cc: Liming Gao <gaoliming@byosoft.com.cn>
> > Cc: Yuwei Chen <yuwei.chen@intel.com>
> > Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
> > ---
> >  BaseTools/Conf/tools_def.template | 16 ++++++++--------
> >  1 file changed, 8 insertions(+), 8 deletions(-)
> >
> > diff --git a/BaseTools/Conf/tools_def.template
> > b/BaseTools/Conf/tools_def.template
> > index 933b3160fd2b..c6c9edf5a0d7 100755
> > --- a/BaseTools/Conf/tools_def.template
> > +++ b/BaseTools/Conf/tools_def.template
> > @@ -1,5 +1,5 @@
> >  #
> > -#  Copyright (c) 2006 - 2018, Intel Corporation. All rights
> > reserved.<BR>
> > +#  Copyright (c) 2006 - 2021, Intel Corporation. All rights
> > +reserved.<BR>
> >  #  Portions copyright (c) 2008 - 2009, Apple Inc. All rights
> > reserved.<BR>  # Portions copyright (c) 2011 - 2019, ARM Ltd. All
> > rights reserved.<BR>  # Copyright (c) 2015, Hewlett-Packard
> > Development Company, L.P.<BR> @@ -
> > 531,7 +531,7 @@ NOOPT_VS2008_X64_DLINK_FLAGS  = /NOLOGO
> /NODEFAULTLIB
> > /IGNORE:4001 /OPT:REF /OPT
> >  *_VS2008x86_*_*_FAMILY        = MSFT
> >
> >  *_VS2008x86_*_MAKE_PATH       = DEF(VS2008x86_BIN)\nmake.exe
> > -*_VS2008x86_*_MAKE_FLAG       = /nologo
> > +*_VS2008x86_*_MAKE_FLAGS      = /nologo
> >  *_VS2008x86_*_RC_PATH         = DEF(WINSDK_BIN)\rc.exe
> >
> >  *_VS2008x86_*_MAKE_FLAGS      = /nologo
> > @@ -765,7 +765,7 @@ NOOPT_VS2010_X64_DLINK_FLAGS  = /NOLOGO
> > /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT
> >  *_VS2010x86_*_*_FAMILY        = MSFT
> >
> >  *_VS2010x86_*_MAKE_PATH       = DEF(VS2010x86_BIN)\nmake.exe
> > -*_VS2010x86_*_MAKE_FLAG       = /nologo
> > +*_VS2010x86_*_MAKE_FLAGS      = /nologo
> >  *_VS2010x86_*_RC_PATH         = DEF(WINSDK7x86_BIN)\rc.exe
> >
> >  *_VS2010x86_*_MAKE_FLAGS      = /nologo
> > @@ -999,7 +999,7 @@ NOOPT_VS2012_X64_DLINK_FLAGS  = /NOLOGO
> > /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT
> >  *_VS2012x86_*_*_FAMILY        = MSFT
> >
> >  *_VS2012x86_*_MAKE_PATH       = DEF(VS2012x86_BIN)\nmake.exe
> > -*_VS2012x86_*_MAKE_FLAG       = /nologo
> > +*_VS2012x86_*_MAKE_FLAGS      = /nologo
> >  *_VS2012x86_*_RC_PATH         = DEF(WINSDK71x86_BIN)\rc.exe
> >
> >  *_VS2012x86_*_MAKE_FLAGS      = /nologo
> > @@ -1233,7 +1233,7 @@ NOOPT_VS2013_X64_DLINK_FLAGS  = /NOLOGO
> > /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT
> >  *_VS2013x86_*_*_FAMILY        = MSFT
> >
> >  *_VS2013x86_*_MAKE_PATH       = DEF(VS2013x86_BIN)\nmake.exe
> > -*_VS2013x86_*_MAKE_FLAG       = /nologo
> > +*_VS2013x86_*_MAKE_FLAGS      = /nologo
> >  *_VS2013x86_*_RC_PATH         = DEF(WINSDK8x86_BIN)\rc.exe
> >
> >  *_VS2013x86_*_MAKE_FLAGS      = /nologo
> > @@ -1468,7 +1468,7 @@ NOOPT_VS2015_X64_DLINK_FLAGS  = /NOLOGO
> > /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT
> >  *_VS2015x86_*_*_FAMILY        = MSFT
> >
> >  *_VS2015x86_*_MAKE_PATH       = DEF(VS2015x86_BIN)\nmake.exe
> > -*_VS2015x86_*_MAKE_FLAG       = /nologo
> > +*_VS2015x86_*_MAKE_FLAGS      = /nologo
> >  *_VS2015x86_*_RC_PATH         = DEF(WINSDK81x86_BIN)\rc.exe
> >
> >  *_VS2015x86_*_MAKE_FLAGS      = /nologo
> > @@ -1586,7 +1586,7 @@ NOOPT_VS2015x86_X64_DLINK_FLAGS    =
> > /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF
> >  *_VS2017_*_*_DLL           = DEF(VS2017_BIN_HOST)
> >
> >  *_VS2017_*_MAKE_PATH       = DEF(VS2017_BIN_HOST)\nmake.exe
> > -*_VS2017_*_MAKE_FLAG       = /nologo
> > +*_VS2017_*_MAKE_FLAGS      = /nologo
> >  *_VS2017_*_RC_PATH         = DEF(RC_PATH)
> >
> >  *_VS2017_*_MAKE_FLAGS      = /nologo
> > @@ -1749,7 +1749,7 @@ NOOPT_VS2017_AARCH64_DLINK_FLAGS   =
> > /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF
> >  *_VS2019_*_*_DLL           = DEF(VS2019_BIN_HOST)
> >
> >  *_VS2019_*_MAKE_PATH       = DEF(VS2019_BIN_HOST)\nmake.exe
> > -*_VS2019_*_MAKE_FLAG       = /nologo
> > +*_VS2019_*_MAKE_FLAGS      = /nologo
> >  *_VS2019_*_RC_PATH         = DEF(RC_PATH)
> >
> >  *_VS2019_*_MAKE_FLAGS      = /nologo
> > --
> > 2.31.1.windows.1
> 
> 
> 
> 
> 


^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [edk2-devel] [Patch 1/1] BaseTools/Conf: Fix MAKE_FLAGS typos in tools_def.template
  2021-04-13  7:39   ` [edk2-devel] " Yuwei Chen
@ 2021-04-13 14:17     ` Michael D Kinney
  0 siblings, 0 replies; 5+ messages in thread
From: Michael D Kinney @ 2021-04-13 14:17 UTC (permalink / raw)
  To: Chen, Christine, devel@edk2.groups.io, Kinney, Michael D
  Cc: Feng, Bob C, Liming Gao

Hi,

I also noticed a many duplications for MAKE_FLAGS where a more extensive cleanup is possible.

I decided to fix the typos first and then do a 2nd patch to remove all duplicates.

Mike

> -----Original Message-----
> From: Chen, Christine <yuwei.chen@intel.com>
> Sent: Tuesday, April 13, 2021 12:39 AM
> To: devel@edk2.groups.io; Chen, Christine <yuwei.chen@intel.com>; Kinney, Michael D <michael.d.kinney@intel.com>
> Cc: Feng, Bob C <bob.c.feng@intel.com>; Liming Gao <gaoliming@byosoft.com.cn>
> Subject: RE: [edk2-devel] [Patch 1/1] BaseTools/Conf: Fix MAKE_FLAGS typos in tools_def.template
> 
> Hi Mike,
> 
> I have a minor comment. As you change the '*_MAKE_FLAG' to '*_MAKE_FLAGS',   there will have two same '*_MAKE_FLAGS' for
> the tool chain. It may be duplicated. Would it be better if just delete "* _MAKE_FLAG"?
> 
> Thanks,
> Christine
> 
> > -----Original Message-----
> > From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Yuwei
> > Chen
> > Sent: Monday, April 12, 2021 9:48 AM
> > To: Kinney, Michael D <michael.d.kinney@intel.com>; devel@edk2.groups.io
> > Cc: Feng, Bob C <bob.c.feng@intel.com>; Liming Gao
> > <gaoliming@byosoft.com.cn>
> > Subject: Re: [edk2-devel] [Patch 1/1] BaseTools/Conf: Fix MAKE_FLAGS typos
> > in tools_def.template
> >
> > Reviewed-by: Yuwei Chen<yuwei.chen@intel.com>
> >
> > > -----Original Message-----
> > > From: Kinney, Michael D <michael.d.kinney@intel.com>
> > > Sent: Saturday, April 10, 2021 6:00 AM
> > > To: devel@edk2.groups.io
> > > Cc: Feng, Bob C <bob.c.feng@intel.com>; Liming Gao
> > > <gaoliming@byosoft.com.cn>; Chen, Christine <yuwei.chen@intel.com>
> > > Subject: [Patch 1/1] BaseTools/Conf: Fix MAKE_FLAGS typos in
> > > tools_def.template
> > >
> > > REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3313
> > >
> > > Change MAKE_FLAG to MAKE_FLAGS to match required name from EDK II
> > > Build Specifications for VS20xx tool chains.
> > >
> > > Cc: Bob Feng <bob.c.feng@intel.com>
> > > Cc: Liming Gao <gaoliming@byosoft.com.cn>
> > > Cc: Yuwei Chen <yuwei.chen@intel.com>
> > > Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
> > > ---
> > >  BaseTools/Conf/tools_def.template | 16 ++++++++--------
> > >  1 file changed, 8 insertions(+), 8 deletions(-)
> > >
> > > diff --git a/BaseTools/Conf/tools_def.template
> > > b/BaseTools/Conf/tools_def.template
> > > index 933b3160fd2b..c6c9edf5a0d7 100755
> > > --- a/BaseTools/Conf/tools_def.template
> > > +++ b/BaseTools/Conf/tools_def.template
> > > @@ -1,5 +1,5 @@
> > >  #
> > > -#  Copyright (c) 2006 - 2018, Intel Corporation. All rights
> > > reserved.<BR>
> > > +#  Copyright (c) 2006 - 2021, Intel Corporation. All rights
> > > +reserved.<BR>
> > >  #  Portions copyright (c) 2008 - 2009, Apple Inc. All rights
> > > reserved.<BR>  # Portions copyright (c) 2011 - 2019, ARM Ltd. All
> > > rights reserved.<BR>  # Copyright (c) 2015, Hewlett-Packard
> > > Development Company, L.P.<BR> @@ -
> > > 531,7 +531,7 @@ NOOPT_VS2008_X64_DLINK_FLAGS  = /NOLOGO
> > /NODEFAULTLIB
> > > /IGNORE:4001 /OPT:REF /OPT
> > >  *_VS2008x86_*_*_FAMILY        = MSFT
> > >
> > >  *_VS2008x86_*_MAKE_PATH       = DEF(VS2008x86_BIN)\nmake.exe
> > > -*_VS2008x86_*_MAKE_FLAG       = /nologo
> > > +*_VS2008x86_*_MAKE_FLAGS      = /nologo
> > >  *_VS2008x86_*_RC_PATH         = DEF(WINSDK_BIN)\rc.exe
> > >
> > >  *_VS2008x86_*_MAKE_FLAGS      = /nologo
> > > @@ -765,7 +765,7 @@ NOOPT_VS2010_X64_DLINK_FLAGS  = /NOLOGO
> > > /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT
> > >  *_VS2010x86_*_*_FAMILY        = MSFT
> > >
> > >  *_VS2010x86_*_MAKE_PATH       = DEF(VS2010x86_BIN)\nmake.exe
> > > -*_VS2010x86_*_MAKE_FLAG       = /nologo
> > > +*_VS2010x86_*_MAKE_FLAGS      = /nologo
> > >  *_VS2010x86_*_RC_PATH         = DEF(WINSDK7x86_BIN)\rc.exe
> > >
> > >  *_VS2010x86_*_MAKE_FLAGS      = /nologo
> > > @@ -999,7 +999,7 @@ NOOPT_VS2012_X64_DLINK_FLAGS  = /NOLOGO
> > > /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT
> > >  *_VS2012x86_*_*_FAMILY        = MSFT
> > >
> > >  *_VS2012x86_*_MAKE_PATH       = DEF(VS2012x86_BIN)\nmake.exe
> > > -*_VS2012x86_*_MAKE_FLAG       = /nologo
> > > +*_VS2012x86_*_MAKE_FLAGS      = /nologo
> > >  *_VS2012x86_*_RC_PATH         = DEF(WINSDK71x86_BIN)\rc.exe
> > >
> > >  *_VS2012x86_*_MAKE_FLAGS      = /nologo
> > > @@ -1233,7 +1233,7 @@ NOOPT_VS2013_X64_DLINK_FLAGS  = /NOLOGO
> > > /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT
> > >  *_VS2013x86_*_*_FAMILY        = MSFT
> > >
> > >  *_VS2013x86_*_MAKE_PATH       = DEF(VS2013x86_BIN)\nmake.exe
> > > -*_VS2013x86_*_MAKE_FLAG       = /nologo
> > > +*_VS2013x86_*_MAKE_FLAGS      = /nologo
> > >  *_VS2013x86_*_RC_PATH         = DEF(WINSDK8x86_BIN)\rc.exe
> > >
> > >  *_VS2013x86_*_MAKE_FLAGS      = /nologo
> > > @@ -1468,7 +1468,7 @@ NOOPT_VS2015_X64_DLINK_FLAGS  = /NOLOGO
> > > /NODEFAULTLIB /IGNORE:4001 /OPT:REF /OPT
> > >  *_VS2015x86_*_*_FAMILY        = MSFT
> > >
> > >  *_VS2015x86_*_MAKE_PATH       = DEF(VS2015x86_BIN)\nmake.exe
> > > -*_VS2015x86_*_MAKE_FLAG       = /nologo
> > > +*_VS2015x86_*_MAKE_FLAGS      = /nologo
> > >  *_VS2015x86_*_RC_PATH         = DEF(WINSDK81x86_BIN)\rc.exe
> > >
> > >  *_VS2015x86_*_MAKE_FLAGS      = /nologo
> > > @@ -1586,7 +1586,7 @@ NOOPT_VS2015x86_X64_DLINK_FLAGS    =
> > > /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF
> > >  *_VS2017_*_*_DLL           = DEF(VS2017_BIN_HOST)
> > >
> > >  *_VS2017_*_MAKE_PATH       = DEF(VS2017_BIN_HOST)\nmake.exe
> > > -*_VS2017_*_MAKE_FLAG       = /nologo
> > > +*_VS2017_*_MAKE_FLAGS      = /nologo
> > >  *_VS2017_*_RC_PATH         = DEF(RC_PATH)
> > >
> > >  *_VS2017_*_MAKE_FLAGS      = /nologo
> > > @@ -1749,7 +1749,7 @@ NOOPT_VS2017_AARCH64_DLINK_FLAGS   =
> > > /NOLOGO /NODEFAULTLIB /IGNORE:4001 /OPT:REF
> > >  *_VS2019_*_*_DLL           = DEF(VS2019_BIN_HOST)
> > >
> > >  *_VS2019_*_MAKE_PATH       = DEF(VS2019_BIN_HOST)\nmake.exe
> > > -*_VS2019_*_MAKE_FLAG       = /nologo
> > > +*_VS2019_*_MAKE_FLAGS      = /nologo
> > >  *_VS2019_*_RC_PATH         = DEF(RC_PATH)
> > >
> > >  *_VS2019_*_MAKE_FLAGS      = /nologo
> > > --
> > > 2.31.1.windows.1
> >
> >
> >
> > 
> >


^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2021-04-13 14:17 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-04-09 22:00 [Patch 1/1] BaseTools/Conf: Fix MAKE_FLAGS typos in tools_def.template Michael D Kinney
2021-04-12  1:32 ` 回复: " gaoliming
2021-04-12  1:48 ` Yuwei Chen
     [not found] ` <1674F9256FCB7012.19371@groups.io>
2021-04-13  7:39   ` [edk2-devel] " Yuwei Chen
2021-04-13 14:17     ` Michael D Kinney

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox