[edk2,edk2-staging,01/20] IntelUndiPkg/XGigUndiDxe: create GCC alternatives for MSFT build options

Message ID 20181115023353.20159-2-ard.biesheuvel@linaro.org
State New
Headers show
Series
  • IntelUndiPkg/XGigUndiDxe: fix GCC / ARM build issues
Related show

Commit Message

Ard Biesheuvel Nov. 15, 2018, 2:33 a.m.
Prefix the existing MSFT-only build option overrides with MSFT: and
create the GCC: counterparts so we can build this code with GCC as
well.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>

---
 IntelUndiPkg/XGigUndiDxe/XGigUndiDxe.inf | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

-- 
2.17.1

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel

Comments

Ryszard Knop Jan. 30, 2019, 3:41 p.m. | #1
Reviewed-by: Ryszard Knop <ryszard.knop@linux.intel.com>


On Wed, 2018-11-14 at 18:33 -0800, ard.biesheuvela wrote:
> Prefix the existing MSFT-only build option overrides with MSFT: and

> create the GCC: counterparts so we can build this code with GCC as

> well.

> 

> Contributed-under: TianoCore Contribution Agreement 1.1

> Signed-off-by: Ard Biesheuvel <ard.biesheuvel at linaro.org>

> ---

>  IntelUndiPkg/XGigUndiDxe/XGigUndiDxe.inf | 13 +++++++++----

>  1 file changed, 9 insertions(+), 4 deletions(-)

> 

> diff --git a/IntelUndiPkg/XGigUndiDxe/XGigUndiDxe.inf

> b/IntelUndiPkg/XGigUndiDxe/XGigUndiDxe.inf

> index 9e0e4aff0885..ab9c64dac7e8 100644

> --- a/IntelUndiPkg/XGigUndiDxe/XGigUndiDxe.inf

> +++ b/IntelUndiPkg/XGigUndiDxe/XGigUndiDxe.inf

> @@ -44,19 +44,24 @@ UNLOAD_IMAGE         = UnloadXGigUndiDriver

>  

>  [BuildOptions.common]

>  

> -*_*_*_CC_FLAGS = /FAcs /D MDEPKG_NDEBUG /D UNDI_10G

> +MSFT:*_*_*_CC_FLAGS = /FAcs /D MDEPKG_NDEBUG /D UNDI_10G

> +GCC:*_*_*_CC_FLAGS = -DUNDI_10G

> +GCC:RELEASE_*_*_CC_FLAGS = -DMDEPKG_NDEBUG

>  

>  [BuildOptions.X64]

>  

> -*_*_*_CC_FLAGS = /D EFIX64 

> +MSFT:*_*_*_CC_FLAGS = /D EFIX64

> +GCC:*_*_*_CC_FLAGS = -DEFIX64

>  

>  [BuildOptions.IPF]

>  

> -*_*_*_CC_FLAGS = /D EFI64

> +MSFT:*_*_*_CC_FLAGS = /D EFI64

> +GCC:*_*_*_CC_FLAGS = -DEFI64

>  

>  [BuildOptions.IA32]

>  

> -*_*_*_CC_FLAGS = /D EFI32

> +MSFT:*_*_*_CC_FLAGS = /D EFI32

> +GCC:*_*_*_CC_FLAGS = -DEFI32

>  

>  [sources.common]

>   InventoryStrings.uni


_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel

Patch

diff --git a/IntelUndiPkg/XGigUndiDxe/XGigUndiDxe.inf b/IntelUndiPkg/XGigUndiDxe/XGigUndiDxe.inf
index 9e0e4aff0885..ab9c64dac7e8 100644
--- a/IntelUndiPkg/XGigUndiDxe/XGigUndiDxe.inf
+++ b/IntelUndiPkg/XGigUndiDxe/XGigUndiDxe.inf
@@ -44,19 +44,24 @@  UNLOAD_IMAGE         = UnloadXGigUndiDriver
 
 [BuildOptions.common]
 
-*_*_*_CC_FLAGS = /FAcs /D MDEPKG_NDEBUG /D UNDI_10G
+MSFT:*_*_*_CC_FLAGS = /FAcs /D MDEPKG_NDEBUG /D UNDI_10G
+GCC:*_*_*_CC_FLAGS = -DUNDI_10G
+GCC:RELEASE_*_*_CC_FLAGS = -DMDEPKG_NDEBUG
 
 [BuildOptions.X64]
 
-*_*_*_CC_FLAGS = /D EFIX64 
+MSFT:*_*_*_CC_FLAGS = /D EFIX64
+GCC:*_*_*_CC_FLAGS = -DEFIX64
 
 [BuildOptions.IPF]
 
-*_*_*_CC_FLAGS = /D EFI64
+MSFT:*_*_*_CC_FLAGS = /D EFI64
+GCC:*_*_*_CC_FLAGS = -DEFI64
 
 [BuildOptions.IA32]
 
-*_*_*_CC_FLAGS = /D EFI32
+MSFT:*_*_*_CC_FLAGS = /D EFI32
+GCC:*_*_*_CC_FLAGS = -DEFI32
 
 [sources.common]
  InventoryStrings.uni