From 945c1d55c9333437896613540fcd458c32997b1c Mon Sep 17 00:00:00 2001 From: Ard Biesheuvel Date: Fri, 25 Jan 2019 09:12:05 +0100 Subject: [PATCH] MdeModulePkg/MdeModulePkg.dsc: ignore standalone MM modules for EBC or XCODE5 The newly added standalone MM versions of the FTW and variable runtime drivers were included in MdeModulePkg.dsc to get test coverage when building the package from its own .dsc, but the resulting modules are non-functional since they incorporate some dummy libraries. Dandan reports that these modules don't build cleanly when using the EBC or XCODE5 compilers, so given the above, let's just ignore them in this case. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Ard Biesheuvel Reviewed-by: Liming Gao Reviewed-by: Bi Dandan --- MdeModulePkg/MdeModulePkg.dsc | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/MdeModulePkg/MdeModulePkg.dsc b/MdeModulePkg/MdeModulePkg.dsc index 93eaf4b404..55eca4d74c 100644 --- a/MdeModulePkg/MdeModulePkg.dsc +++ b/MdeModulePkg/MdeModulePkg.dsc @@ -426,9 +426,6 @@ MdeModulePkg/Library/DxeCapsuleLibFmp/DxeCapsuleLib.inf MdeModulePkg/Library/DxeCapsuleLibFmp/DxeRuntimeCapsuleLib.inf - MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteStandaloneMm.inf - MdeModulePkg/Universal/Variable/RuntimeDxe/VariableStandaloneMm.inf - [Components.IA32, Components.X64, Components.AARCH64] MdeModulePkg/Universal/EbcDxe/EbcDxe.inf MdeModulePkg/Universal/EbcDxe/EbcDebugger.inf @@ -442,6 +439,11 @@ NULL|MdeModulePkg/Library/DxeCrc32GuidedSectionExtractLib/DxeCrc32GuidedSectionExtractLib.inf } +!if $(TOOL_CHAIN_TAG) != "XCODE5" + MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteStandaloneMm.inf + MdeModulePkg/Universal/Variable/RuntimeDxe/VariableStandaloneMm.inf +!endif + [Components.IA32, Components.X64, Components.Ebc] MdeModulePkg/Universal/Variable/EmuRuntimeDxe/EmuVariableRuntimeDxe.inf -- 2.39.2