OvmfPkg: Add XCODE5 statements to fix build break

[mirror_edk2.git] / OvmfPkg / OvmfPkgIa32.dsc

diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc
index 64427716c53c40f1e6059c26d60257b801060789..a0ea5db55c27dee4d427b43437d370a324b67107 100644 (file)
--- a/OvmfPkg/OvmfPkgIa32.dsc
+++ b/OvmfPkg/OvmfPkgIa32.dsc
@@ -75,11 +75,13 @@
 \r
 [BuildOptions.common.EDKII.DXE_RUNTIME_DRIVER]\r
   GCC:*_*_*_DLINK_FLAGS = -z common-page-size=0x1000\r
+  XCODE:*_*_*_DLINK_FLAGS =\r
 \r
 # Force PE/COFF sections to be aligned at 4KB boundaries to support page level\r
 # protection of DXE_SMM_DRIVER/SMM_CORE modules\r
 [BuildOptions.common.EDKII.DXE_SMM_DRIVER, BuildOptions.common.EDKII.SMM_CORE]\r
   GCC:*_*_*_DLINK_FLAGS = -z common-page-size=0x1000\r
+  XCODE:*_*_*_DLINK_FLAGS =\r
 \r
 ################################################################################\r
 #\r
@@ -256,6 +258,7 @@
   CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/PeiCpuExceptionHandlerLib.inf\r
   MpInitLib|UefiCpuPkg/Library/MpInitLib/PeiMpInitLib.inf\r
   QemuFwCfgS3Lib|OvmfPkg/Library/QemuFwCfgS3Lib/PeiQemuFwCfgS3LibFwCfg.inf\r
+  PcdLib|MdePkg/Library/PeiPcdLib/PeiPcdLib.inf\r
 \r
 [LibraryClasses.common.DXE_CORE]\r
   HobLib|MdePkg/Library/DxeCoreHobLib/DxeCoreHobLib.inf\r
@@ -495,7 +498,10 @@
 ################################################################################\r
 \r
 [PcdsDynamicDefault]\r
+  # only set when\r
+  #   ($(SMM_REQUIRE) == FALSE)\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdEmuVariableNvStoreReserved|0\r
+\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase64|0\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase|0\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareBase|0\r
@@ -556,34 +562,27 @@
     <LibraryClasses>\r
       PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf\r
   }\r
-  MdeModulePkg/Universal/ReportStatusCodeRouter/Pei/ReportStatusCodeRouterPei.inf\r
-  MdeModulePkg/Universal/StatusCodeHandler/Pei/StatusCodeHandlerPei.inf\r
-  MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf {\r
+  MdeModulePkg/Universal/ReportStatusCodeRouter/Pei/ReportStatusCodeRouterPei.inf {\r
     <LibraryClasses>\r
-      PcdLib|MdePkg/Library/PeiPcdLib/PeiPcdLib.inf\r
+      PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf\r
   }\r
-\r
-  OvmfPkg/PlatformPei/PlatformPei.inf {\r
+  MdeModulePkg/Universal/StatusCodeHandler/Pei/StatusCodeHandlerPei.inf {\r
     <LibraryClasses>\r
-      PcdLib|MdePkg/Library/PeiPcdLib/PeiPcdLib.inf\r
+      PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf\r
   }\r
+  MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf\r
+\r
+  OvmfPkg/PlatformPei/PlatformPei.inf\r
   UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume2Pei.inf {\r
     <LibraryClasses>\r
-      PcdLib|MdePkg/Library/PeiPcdLib/PeiPcdLib.inf\r
 !if $(SMM_REQUIRE) == TRUE\r
       LockBoxLib|MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxPeiLib.inf\r
 !endif\r
   }\r
 !if $(SMM_REQUIRE) == TRUE\r
-  OvmfPkg/SmmAccess/SmmAccessPei.inf {\r
-    <LibraryClasses>\r
-      PcdLib|MdePkg/Library/PeiPcdLib/PeiPcdLib.inf\r
-  }\r
+  OvmfPkg/SmmAccess/SmmAccessPei.inf\r
 !endif\r
-  UefiCpuPkg/CpuMpPei/CpuMpPei.inf {\r
-    <LibraryClasses>\r
-      PcdLib|MdePkg/Library/PeiPcdLib/PeiPcdLib.inf\r
-  }\r
+  UefiCpuPkg/CpuMpPei/CpuMpPei.inf\r
 \r
   #\r
   # DXE Phase modules\r