[Linaro-uefi,2/3] Platforms/ARM/Juno: add PLATFORM_FLAGS rather than override them

Message ID 1477652599-26330-2-git-send-email-ard.biesheuvel@linaro.org
State New
Headers show

Commit Message

Ard Biesheuvel Oct. 28, 2016, 11:03 a.m.
The ArmJuno.dsc [BuildOptions] section adds some include paths to the
compiler flags, by overriding the PLATFORM_FLAGS build variable of all
build types, toolchains and architectures, using an == assignment.

Since some of PLATFORM_FLAGS variants may contain compiler switches that
we may want to keep, using = to add rather than replace is more appropriate
here.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
---
 Platforms/ARM/Juno/ArmJuno.dsc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Leif Lindholm Oct. 28, 2016, 3:19 p.m. | #1
On Fri, Oct 28, 2016 at 12:03:18PM +0100, Ard Biesheuvel wrote:
> The ArmJuno.dsc [BuildOptions] section adds some include paths to the
> compiler flags, by overriding the PLATFORM_FLAGS build variable of all
> build types, toolchains and architectures, using an == assignment.
> 
> Since some of PLATFORM_FLAGS variants may contain compiler switches that
> we may want to keep, using = to add rather than replace is more appropriate
> here.
> 
> Contributed-under: TianoCore Contribution Agreement 1.0
> Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>

Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org>

> ---
>  Platforms/ARM/Juno/ArmJuno.dsc | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/Platforms/ARM/Juno/ArmJuno.dsc b/Platforms/ARM/Juno/ArmJuno.dsc
> index 182aa5520602..154de2cd8797 100644
> --- a/Platforms/ARM/Juno/ArmJuno.dsc
> +++ b/Platforms/ARM/Juno/ArmJuno.dsc
> @@ -67,7 +67,7 @@
>    PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf
>  
>  [BuildOptions]
> -  *_*_*_PLATFORM_FLAGS == -I$(WORKSPACE)/ArmPlatformPkg/ArmVExpressPkg/Include -I$(WORKSPACE)/ArmPlatformPkg/ArmJunoPkg/Include
> +  *_*_*_PLATFORM_FLAGS = -I$(WORKSPACE)/ArmPlatformPkg/ArmVExpressPkg/Include -I$(WORKSPACE)/ArmPlatformPkg/ArmJunoPkg/Include
>  
>  ################################################################################
>  #
> -- 
> 2.7.4
>

Patch

diff --git a/Platforms/ARM/Juno/ArmJuno.dsc b/Platforms/ARM/Juno/ArmJuno.dsc
index 182aa5520602..154de2cd8797 100644
--- a/Platforms/ARM/Juno/ArmJuno.dsc
+++ b/Platforms/ARM/Juno/ArmJuno.dsc
@@ -67,7 +67,7 @@ 
   PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf
 
 [BuildOptions]
-  *_*_*_PLATFORM_FLAGS == -I$(WORKSPACE)/ArmPlatformPkg/ArmVExpressPkg/Include -I$(WORKSPACE)/ArmPlatformPkg/ArmJunoPkg/Include
+  *_*_*_PLATFORM_FLAGS = -I$(WORKSPACE)/ArmPlatformPkg/ArmVExpressPkg/Include -I$(WORKSPACE)/ArmPlatformPkg/ArmJunoPkg/Include
 
 ################################################################################
 #