In commit 1cab464136b4 we incorrectly described the
EDK2_BASETOOLS_OPTFLAGS can pass CPPFLAGS and CFLAGS
options to the EDK2 build tools, but it only expands
the CFLAGS (not to the CPPFLAGS).
Update the description to be more accurate.
Reported-by: Laszlo Ersek <lersek@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
roms/Makefile | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/roms/Makefile b/roms/Makefile
index 1ff78b63bb3..d7fd6025e7c 100644
--- a/roms/Makefile
+++ b/roms/Makefile
@@ -120,8 +120,8 @@ build-efi-roms: build-pxe-roms
$(patsubst %,bin-i386-efi/%.efidrv,$(pxerom_targets)) \
$(patsubst %,bin-x86_64-efi/%.efidrv,$(pxerom_targets))
-# Build scripts can pass compiler/linker flags to the EDK2 build tools
-# via the EDK2_BASETOOLS_OPTFLAGS (CPPFLAGS and CFLAGS) and
+# Build scripts can pass compiler/linker flags to the EDK2
+# build tools via the EDK2_BASETOOLS_OPTFLAGS (CFLAGS) and
# EDK2_BASETOOLS_LDFLAGS (LDFLAGS) environment variables.
#
# Example:
--
2.20.1
On 04/10/19 06:57, Philippe Mathieu-Daudé wrote: > In commit 1cab464136b4 we incorrectly described the > EDK2_BASETOOLS_OPTFLAGS can pass CPPFLAGS and CFLAGS > options to the EDK2 build tools, but it only expands > the CFLAGS (not to the CPPFLAGS). > Update the description to be more accurate. > > Reported-by: Laszlo Ersek <lersek@redhat.com> > Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> > --- > roms/Makefile | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/roms/Makefile b/roms/Makefile > index 1ff78b63bb3..d7fd6025e7c 100644 > --- a/roms/Makefile > +++ b/roms/Makefile > @@ -120,8 +120,8 @@ build-efi-roms: build-pxe-roms > $(patsubst %,bin-i386-efi/%.efidrv,$(pxerom_targets)) \ > $(patsubst %,bin-x86_64-efi/%.efidrv,$(pxerom_targets)) > > -# Build scripts can pass compiler/linker flags to the EDK2 build tools > -# via the EDK2_BASETOOLS_OPTFLAGS (CPPFLAGS and CFLAGS) and > +# Build scripts can pass compiler/linker flags to the EDK2 > +# build tools via the EDK2_BASETOOLS_OPTFLAGS (CFLAGS) and > # EDK2_BASETOOLS_LDFLAGS (LDFLAGS) environment variables. > # > # Example: > Reviewed-by: Laszlo Ersek <lersek@redhat.com> Please noone submit a pull request with this patch (for 4.1) until my edk2 bundling series is merged; as this one will likely introduce another contextual conflict, and I'd *really* like to avoid another rebase on my end, due to such an issue. Thanks! Laszlo
On 4/10/19 4:58 PM, Laszlo Ersek wrote: > On 04/10/19 06:57, Philippe Mathieu-Daudé wrote: >> In commit 1cab464136b4 we incorrectly described the >> EDK2_BASETOOLS_OPTFLAGS can pass CPPFLAGS and CFLAGS >> options to the EDK2 build tools, but it only expands >> the CFLAGS (not to the CPPFLAGS). >> Update the description to be more accurate. >> >> Reported-by: Laszlo Ersek <lersek@redhat.com> >> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> >> --- >> roms/Makefile | 4 ++-- >> 1 file changed, 2 insertions(+), 2 deletions(-) >> >> diff --git a/roms/Makefile b/roms/Makefile >> index 1ff78b63bb3..d7fd6025e7c 100644 >> --- a/roms/Makefile >> +++ b/roms/Makefile >> @@ -120,8 +120,8 @@ build-efi-roms: build-pxe-roms >> $(patsubst %,bin-i386-efi/%.efidrv,$(pxerom_targets)) \ >> $(patsubst %,bin-x86_64-efi/%.efidrv,$(pxerom_targets)) >> >> -# Build scripts can pass compiler/linker flags to the EDK2 build tools >> -# via the EDK2_BASETOOLS_OPTFLAGS (CPPFLAGS and CFLAGS) and >> +# Build scripts can pass compiler/linker flags to the EDK2 >> +# build tools via the EDK2_BASETOOLS_OPTFLAGS (CFLAGS) and >> # EDK2_BASETOOLS_LDFLAGS (LDFLAGS) environment variables. >> # >> # Example: >> > > Reviewed-by: Laszlo Ersek <lersek@redhat.com> > > Please noone submit a pull request with this patch (for 4.1) until my > edk2 bundling series is merged; as this one will likely introduce > another contextual conflict, and I'd *really* like to avoid another > rebase on my end, due to such an issue. Thanks for the review. I'll rebase it on top of your 'bundle edk2 platform firmware with QEMU' v4 and resend (later). Feel free to include it on top of your pullreq. Regards, Phil.
On 04/10/19 17:10, Philippe Mathieu-Daudé wrote: > On 4/10/19 4:58 PM, Laszlo Ersek wrote: >> On 04/10/19 06:57, Philippe Mathieu-Daudé wrote: >>> In commit 1cab464136b4 we incorrectly described the >>> EDK2_BASETOOLS_OPTFLAGS can pass CPPFLAGS and CFLAGS >>> options to the EDK2 build tools, but it only expands >>> the CFLAGS (not to the CPPFLAGS). >>> Update the description to be more accurate. >>> >>> Reported-by: Laszlo Ersek <lersek@redhat.com> >>> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> >>> --- >>> roms/Makefile | 4 ++-- >>> 1 file changed, 2 insertions(+), 2 deletions(-) >>> >>> diff --git a/roms/Makefile b/roms/Makefile >>> index 1ff78b63bb3..d7fd6025e7c 100644 >>> --- a/roms/Makefile >>> +++ b/roms/Makefile >>> @@ -120,8 +120,8 @@ build-efi-roms: build-pxe-roms >>> $(patsubst %,bin-i386-efi/%.efidrv,$(pxerom_targets)) \ >>> $(patsubst %,bin-x86_64-efi/%.efidrv,$(pxerom_targets)) >>> >>> -# Build scripts can pass compiler/linker flags to the EDK2 build tools >>> -# via the EDK2_BASETOOLS_OPTFLAGS (CPPFLAGS and CFLAGS) and >>> +# Build scripts can pass compiler/linker flags to the EDK2 >>> +# build tools via the EDK2_BASETOOLS_OPTFLAGS (CFLAGS) and >>> # EDK2_BASETOOLS_LDFLAGS (LDFLAGS) environment variables. >>> # >>> # Example: >>> >> >> Reviewed-by: Laszlo Ersek <lersek@redhat.com> >> >> Please noone submit a pull request with this patch (for 4.1) until my >> edk2 bundling series is merged; as this one will likely introduce >> another contextual conflict, and I'd *really* like to avoid another >> rebase on my end, due to such an issue. > > Thanks for the review. I'll rebase it on top of your 'bundle edk2 > platform firmware with QEMU' v4 and resend (later). Thank you! > Feel free to include it on top of your pullreq. ... I think I'll keep that pullreq as minimal as it can be. :) Thanks Laszlo > > Regards, > > Phil. >
© 2016 - 2024 Red Hat, Inc.