Skip to contentSkip to conversation

roms: Correct the EDK2_BASETOOLS_OPTFLAGS variable description

PATCH Superseded Philippe Mathieu-Daudé 2 participants 4 messages Apr 10, 2019

v1 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 roms: Correct the EDK2_BASETOOLS_OPTFLAGS variable description

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.

---
 roms/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
roms/Makefile +2 -2
index 1ff78b63bb3..d7fd6025e7c 100644
@@ -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:
Signature · 1 line
2.20.1
Reviewed-by on v1 1/1
#1 lore raw
Quoted 18 lines · Philippe Mathieu-Daudé

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.

---
 roms/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
roms/Makefile +0 -0
index 1ff78b63bb3..d7fd6025e7c 100644

roms/Makefile build-efi-roms: build-pxe-roms · line 127

Quoted 10 lines
roms/Makefile +2 -2
@@ -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:

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

#2 lore raw
Quoted 32 lines · Laszlo Ersek
Quoted 18 lines · Philippe Mathieu-Daudé

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.

---
 roms/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
roms/Makefile +0 -0
index 1ff78b63bb3..d7fd6025e7c 100644

roms/Makefile build-efi-roms: build-pxe-roms · line 127

Quoted 10 lines
roms/Makefile +2 -2
@@ -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:
Quoted 4 lines

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.

#3 lore raw
Quoted 33 lines · Philippe Mathieu-Daudé
Quoted 32 lines · Laszlo Ersek
Quoted 18 lines · Philippe Mathieu-Daudé

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.

---
 roms/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
roms/Makefile +0 -0
index 1ff78b63bb3..d7fd6025e7c 100644

roms/Makefile build-efi-roms: build-pxe-roms · line 127

Quoted 10 lines
roms/Makefile +2 -2
@@ -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:
Quoted 7 lines
Quoted 4 lines

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!

Quoted 1 line

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

Quoted 5 lines

Regards,

Phil.