From c40442c71e1b83c477a4707b3a7bc8e0d2345eb1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lucas=20Marc=CC=A7al?= Date: Mon, 19 May 2025 13:52:31 -0300 Subject: [PATCH] Bazel 8, replace --swiftcopt with rules_swift//:swift:copt MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Lucas Marçal --- .../bazel_integration_files/generate_bazel_dependencies.sh | 4 ++-- xcodeproj/internal/templates/xcodeproj.bazelrc | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/xcodeproj/internal/bazel_integration_files/generate_bazel_dependencies.sh b/xcodeproj/internal/bazel_integration_files/generate_bazel_dependencies.sh index 0607835633..b0528025e4 100755 --- a/xcodeproj/internal/bazel_integration_files/generate_bazel_dependencies.sh +++ b/xcodeproj/internal/bazel_integration_files/generate_bazel_dependencies.sh @@ -153,7 +153,7 @@ if [[ $apply_sanitizers -eq 1 ]]; then --copt=-fno-sanitize-recover=all --copt=-fsanitize=address --linkopt=-fsanitize=address - --swiftcopt=-sanitize=address + --@build_bazel_rules_swift//swift:copt=-sanitize=address --copt=-Wno-macro-redefined --copt=-D_FORTIFY_SOURCE=0 ) @@ -164,7 +164,7 @@ if [[ $apply_sanitizers -eq 1 ]]; then --copt=-fno-sanitize-recover=all --copt=-fsanitize=thread --linkopt=-fsanitize=thread - --swiftcopt=-sanitize=thread + --@build_bazel_rules_swift//swift:copt=-sanitize=thread ) fi if [ "${ENABLE_UNDEFINED_BEHAVIOR_SANITIZER:-}" == "YES" ]; then diff --git a/xcodeproj/internal/templates/xcodeproj.bazelrc b/xcodeproj/internal/templates/xcodeproj.bazelrc index 2ad00575d0..fba2571969 100644 --- a/xcodeproj/internal/templates/xcodeproj.bazelrc +++ b/xcodeproj/internal/templates/xcodeproj.bazelrc @@ -98,9 +98,9 @@ common:rules_xcodeproj_swiftuipreviews --config=rules_xcodeproj common:rules_xcodeproj_swiftuipreviews --linkopt="-Wl,-rpath,@loader_path/SwiftUIPreviewsFrameworks" # `swiftc` flags needed for SwiftUI Previews -common:rules_xcodeproj_swiftuipreviews --swiftcopt=-Xfrontend --swiftcopt=-enable-implicit-dynamic -common:rules_xcodeproj_swiftuipreviews --swiftcopt=-Xfrontend --swiftcopt=-enable-private-imports -common:rules_xcodeproj_swiftuipreviews --swiftcopt=-Xfrontend --swiftcopt=-enable-dynamic-replacement-chaining +common:rules_xcodeproj_swiftuipreviews --@build_bazel_rules_swift//swift:copt=-Xfrontend --@build_bazel_rules_swift//swift:copt=-enable-implicit-dynamic +common:rules_xcodeproj_swiftuipreviews --@build_bazel_rules_swift//swift:copt=-Xfrontend --@build_bazel_rules_swift//swift:copt=-enable-private-imports +common:rules_xcodeproj_swiftuipreviews --@build_bazel_rules_swift//swift:copt=-Xfrontend --@build_bazel_rules_swift//swift:copt=-enable-dynamic-replacement-chaining ### `--config=_rules_xcodeproj_build` #