Skip to content

Commit

Permalink
Cleanup
Browse files Browse the repository at this point in the history
Reviewed By: ndmitchell

Differential Revision: D68892349

fbshipit-source-id: ee0547f7388c3e756a23fd9b4a36beed95739713
  • Loading branch information
milend authored and facebook-github-bot committed Jan 30, 2025
1 parent 31796d0 commit 76991da
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 4 deletions.
2 changes: 1 addition & 1 deletion prelude/apple/swift/swift_compilation.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
10 changes: 7 additions & 3 deletions prelude/ide_integrations/xcode/argsfiles.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -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()

0 comments on commit 76991da

Please sign in to comment.