From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=2a00:1450:4864:20::441; helo=mail-wr1-x441.google.com; envelope-from=ard.biesheuvel@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-wr1-x441.google.com (mail-wr1-x441.google.com [IPv6:2a00:1450:4864:20::441]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 461B0211B5A3F for ; Fri, 25 Jan 2019 00:13:15 -0800 (PST) Received: by mail-wr1-x441.google.com with SMTP id u4so9277311wrp.3 for ; Fri, 25 Jan 2019 00:13:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=d9/RJFT2DGBaIS/h+gQ1AkOGYousMURggraSygTz3m4=; b=FGH8RR5JF+LBkLINSM/+XTrR/NOZzNjsQA1nQvotDMm8TlkTj2XIxw/+egi/MFZPBW RgogqmtqVSfbtS9/CUiDf5ddFmP4d+4utBsdRWNpWVQ1jmqGAg9Btd9fRrkK7KL7/rDr bJlpt3YSZIeTS5qORkPsjbegbEVJrzgI3lbeM= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=d9/RJFT2DGBaIS/h+gQ1AkOGYousMURggraSygTz3m4=; b=n/2yfi6zR6smUH1+XEYid9FRRmvgbv0gem80a+FHUntBiZaoN42Kl6fTDluhnd1xfZ Fqz6erTlwN4Bo1GgHwLayYhIRUKo2RlLEl80ryRodWC/K0J/l28fdjikNnTRp8m338ke U2V2v8CHV7zOwoXchYuMQWicVXE7yoSk46eKWtMIgZUps0rnZfI6pOr95vVcYDLK1RRp +mw0Gv698MpDr/qSrs8d1VmXOQamj5KEUvLvm1jRJ1bMcdMrrvFCIg4latP6oiUMS43H 6w2kKY/6AFfRxdgkEJiU+SRprkbarawOcfUfyrpIpwns+4O0RdH68GaedWLspWwqkdhI /QnQ== X-Gm-Message-State: AJcUukcnUXWxhNs9z9e/F32IaRRjStp8/0ZwX9hIQoMW+FjhBxQZPWGM 84ilU9wvdbS+uiR46dDygECmJ7+Q4QRQ0A== X-Google-Smtp-Source: ALg8bN6P/hl5qYB9Di/OUofY1XWU1sciyDX+RXgNgdPwDRUPCmTKCEMVWQDoNlfdWqEmjln6G0jWeQ== X-Received: by 2002:adf:c108:: with SMTP id r8mr10726990wre.233.1548403993068; Fri, 25 Jan 2019 00:13:13 -0800 (PST) Received: from localhost.localdomain ([2a01:cb1d:112:6f00:bcd4:806e:230a:673e]) by smtp.gmail.com with ESMTPSA id t5sm70892793wmd.15.2019.01.25.00.13.11 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 25 Jan 2019 00:13:12 -0800 (PST) From: Ard Biesheuvel To: edk2-devel@lists.01.org Cc: liming.gao@intel.com, dandan.bi@intel.com, jian.j.wang@intel.com, Ard Biesheuvel Date: Fri, 25 Jan 2019 09:12:05 +0100 Message-Id: <20190125081205.2967-1-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.17.1 Subject: [PATCH] MdeModulePkg/MdeModulePkg.dsc: ignore standalone MM modules for EBC or XCODE5 X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 25 Jan 2019 08:13:15 -0000 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 --- MdeModulePkg/MdeModulePkg.dsc | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/MdeModulePkg/MdeModulePkg.dsc b/MdeModulePkg/MdeModulePkg.dsc index 93eaf4b404a1..55eca4d74c04 100644 --- a/MdeModulePkg/MdeModulePkg.dsc +++ b/MdeModulePkg/MdeModulePkg.dsc @@ -426,9 +426,6 @@ [Components] 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 @@ [Components.IA32, Components.X64, Components.ARM, Components.AARCH64] 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.17.1