From 76991da753e9495497bd6ded2e72c6122fc8f281 Mon Sep 17 00:00:00 2001
From: Milen Dzhumerov <mgd@meta.com>
Date: Thu, 30 Jan 2025 06:50:39 -0800
Subject: [PATCH] Cleanup
Reviewed By: ndmitchell
Differential Revision: D68892349
fbshipit-source-id: ee0547f7388c3e756a23fd9b4a36beed95739713
---
prelude/apple/swift/swift_compilation.bzl | 2 +-
prelude/ide_integrations/xcode/argsfiles.bzl | 10 +++++++---
2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/prelude/apple/swift/swift_compilation.bzl b/prelude/apple/swift/swift_compilation.bzl
index 354bc9a3e8455..ed455e0b971dd 100644
--- a/prelude/apple/swift/swift_compilation.bzl
+++ b/prelude/apple/swift/swift_compilation.bzl
@@ -821,7 +821,7 @@ def _get_shared_flags(
# Swift compiler defaults to 5 and therefore so do we
# use the version 5 for upcoming features passed to tools
# like the ide-tool for swift-interface generation below
- # https://www.internalfb.com/code/osmeta-external-swift/[toolchain%2Fpika%2F16%3A5e394d813955f6d922cc853d011eeb3b6bead4c6]/include/swift/Basic/LangOptions.h?lines=175-176
+ # include/swift/Basic/LangOptions.h?lines=175-176
swift_version = SwiftVersion[0] # "5"
if ctx.attrs.enable_cxx_interop:
diff --git a/prelude/ide_integrations/xcode/argsfiles.bzl b/prelude/ide_integrations/xcode/argsfiles.bzl
index b056a0b2ba5d7..7a4836770a912 100644
--- a/prelude/ide_integrations/xcode/argsfiles.bzl
+++ b/prelude/ide_integrations/xcode/argsfiles.bzl
@@ -5,12 +5,16 @@
# License, Version 2.0 found in the LICENSE-APACHE file in the root directory
# of this source tree.
+# @oss-disable: load("@prelude//apple/meta_only:xcode_argsfiles.bzl", "get_meta_specific_xcode_arg_substitutions")
+
+def _get_meta_specific_xcode_arg_substitutions():
+ # @oss-disable: return get_meta_specific_xcode_arg_substitutions()
+ return [] # @oss-enable
+
XCODE_ARGSFILES_SUB_TARGET = "xcode-argsfiles"
XCODE_ARG_SUBSTITUTIONS = [
(regex("-filter-error=.+"), "-fcolor-diagnostics"),
(regex("-filter-ignore=.+"), "-fcolor-diagnostics"),
(regex("-filter-warning=.+"), "-fcolor-diagnostics"),
- # @oss-disable: (regex("-fobjc-export-direct-methods"), "-fcolor-diagnostics"),
- # @oss-disable: (regex("-fpika-runtime-checks"), "-fcolor-diagnostics"),
-]
+] + _get_meta_specific_xcode_arg_substitutions()