[PATCH edk2-stable202208 1/1] BaseTools: Fix DevicePath GNUmakefile for macOS

[PATCH edk2-stable202208 1/1] BaseTools: Fix DevicePath GNUmakefile for macOS

[Rebecca Cran]

On macOS, /usr/bin/gcc is clang, and so doesn't have
the -Wno-error=stringop-overflow flag that was added
for gcc 12.
Update the GNUmakefile for DevicePath to skip setting
that on macOS.

Signed-off-by: Rebecca Cran <rebecca@bsdio.com>
---
 BaseTools/Source/C/DevicePath/GNUmakefile | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/BaseTools/Source/C/DevicePath/GNUmakefile b/BaseTools/Source/C/DevicePath/GNUmakefile
index c217674345b1..17f213879e82 100644
--- a/BaseTools/Source/C/DevicePath/GNUmakefile
+++ b/BaseTools/Source/C/DevicePath/GNUmakefile
@@ -16,10 +16,12 @@ include $(MAKEROOT)/Makefiles/app.makefile
 GCCVERSION = $(shell gcc -dumpversion | awk -F'.' '{print $$1}')
 ifneq ("$(GCCVERSION)", "5")
 ifneq ($(CXX), llvm)
+ifneq ($(DARWIN),Darwin)
 # gcc 12 trips over device path handling
 BUILD_CFLAGS += -Wno-error=stringop-overflow
 endif
 endif
+endif
 
 LIBS = -lCommon
 ifeq ($(CYGWIN), CYGWIN)
-- 
2.30.1 (Apple Git-130)

Re: [edk2-devel] [PATCH edk2-stable202208 1/1] BaseTools: Fix DevicePath GNUmakefile for macOS

[Michael D Kinney]

Reviewed-by: Michael D Kinney <michael.d.kinney@intel.com>

I approve for edk2-stable202208

Mike

> -----Original Message-----
> From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Rebecca Cran
> Sent: Thursday, August 25, 2022 6:32 PM
> To: devel@edk2.groups.io; Andrew Fish <afish@apple.com>; Leif Lindholm <quic_llindhol@quicinc.com>; Kinney, Michael D
> <michael.d.kinney@intel.com>; Feng, Bob C <bob.c.feng@intel.com>; Gao, Liming <gaoliming@byosoft.com.cn>; Chen, Christine
> <yuwei.chen@intel.com>
> Cc: Rebecca Cran <rebecca@bsdio.com>
> Subject: [edk2-devel] [PATCH edk2-stable202208 1/1] BaseTools: Fix DevicePath GNUmakefile for macOS
> 
> On macOS, /usr/bin/gcc is clang, and so doesn't have
> the -Wno-error=stringop-overflow flag that was added
> for gcc 12.
> Update the GNUmakefile for DevicePath to skip setting
> that on macOS.
> 
> Signed-off-by: Rebecca Cran <rebecca@bsdio.com>
> ---
>  BaseTools/Source/C/DevicePath/GNUmakefile | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/BaseTools/Source/C/DevicePath/GNUmakefile b/BaseTools/Source/C/DevicePath/GNUmakefile
> index c217674345b1..17f213879e82 100644
> --- a/BaseTools/Source/C/DevicePath/GNUmakefile
> +++ b/BaseTools/Source/C/DevicePath/GNUmakefile
> @@ -16,10 +16,12 @@ include $(MAKEROOT)/Makefiles/app.makefile
>  GCCVERSION = $(shell gcc -dumpversion | awk -F'.' '{print $$1}')
>  ifneq ("$(GCCVERSION)", "5")
>  ifneq ($(CXX), llvm)
> +ifneq ($(DARWIN),Darwin)
>  # gcc 12 trips over device path handling
>  BUILD_CFLAGS += -Wno-error=stringop-overflow
>  endif
>  endif
> +endif
> 
>  LIBS = -lCommon
>  ifeq ($(CYGWIN), CYGWIN)
> --
> 2.30.1 (Apple Git-130)
> 
> 
> 
> 
> 

回复: [edk2-devel] [PATCH edk2-stable202208 1/1] BaseTools: Fix DevicePath GNUmakefile for macOS

[gaoliming]

Merged by https://github.com/tianocore/edk2/pull/3247

Thanks
Liming
> -----邮件原件-----
> 发件人: devel@edk2.groups.io <devel@edk2.groups.io> 代表 Michael D
> Kinney
> 发送时间: 2022年8月26日 9:39
> 收件人: devel@edk2.groups.io; rebecca@bsdio.com; Andrew Fish
> <afish@apple.com>; Leif Lindholm <quic_llindhol@quicinc.com>; Feng, Bob C
> <bob.c.feng@intel.com>; Gao, Liming <gaoliming@byosoft.com.cn>; Chen,
> Christine <yuwei.chen@intel.com>; Kinney, Michael D
> <michael.d.kinney@intel.com>
> 主题: Re: [edk2-devel] [PATCH edk2-stable202208 1/1] BaseTools: Fix
> DevicePath GNUmakefile for macOS
> 
> Reviewed-by: Michael D Kinney <michael.d.kinney@intel.com>
> 
> I approve for edk2-stable202208
> 
> Mike
> 
> > -----Original Message-----
> > From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of
> Rebecca Cran
> > Sent: Thursday, August 25, 2022 6:32 PM
> > To: devel@edk2.groups.io; Andrew Fish <afish@apple.com>; Leif Lindholm
> <quic_llindhol@quicinc.com>; Kinney, Michael D
> > <michael.d.kinney@intel.com>; Feng, Bob C <bob.c.feng@intel.com>; Gao,
> Liming <gaoliming@byosoft.com.cn>; Chen, Christine
> > <yuwei.chen@intel.com>
> > Cc: Rebecca Cran <rebecca@bsdio.com>
> > Subject: [edk2-devel] [PATCH edk2-stable202208 1/1] BaseTools: Fix
> DevicePath GNUmakefile for macOS
> >
> > On macOS, /usr/bin/gcc is clang, and so doesn't have
> > the -Wno-error=stringop-overflow flag that was added
> > for gcc 12.
> > Update the GNUmakefile for DevicePath to skip setting
> > that on macOS.
> >
> > Signed-off-by: Rebecca Cran <rebecca@bsdio.com>
> > ---
> >  BaseTools/Source/C/DevicePath/GNUmakefile | 2 ++
> >  1 file changed, 2 insertions(+)
> >
> > diff --git a/BaseTools/Source/C/DevicePath/GNUmakefile
> b/BaseTools/Source/C/DevicePath/GNUmakefile
> > index c217674345b1..17f213879e82 100644
> > --- a/BaseTools/Source/C/DevicePath/GNUmakefile
> > +++ b/BaseTools/Source/C/DevicePath/GNUmakefile
> > @@ -16,10 +16,12 @@ include $(MAKEROOT)/Makefiles/app.makefile
> >  GCCVERSION = $(shell gcc -dumpversion | awk -F'.' '{print $$1}')
> >  ifneq ("$(GCCVERSION)", "5")
> >  ifneq ($(CXX), llvm)
> > +ifneq ($(DARWIN),Darwin)
> >  # gcc 12 trips over device path handling
> >  BUILD_CFLAGS += -Wno-error=stringop-overflow
> >  endif
> >  endif
> > +endif
> >
> >  LIBS = -lCommon
> >  ifeq ($(CYGWIN), CYGWIN)
> > --
> > 2.30.1 (Apple Git-130)
> >
> >
> >
> >
> >
> 
> 
> 
> 
>