Skip to content

Commit

Permalink
bazel_7: restore xcode_locator no-arc fix, still needed
Browse files Browse the repository at this point in the history
layus committed Dec 13, 2023

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
1 parent 5fc2602 commit 6d93cdd
Showing 2 changed files with 33 additions and 2 deletions.
Original file line number Diff line number Diff line change
@@ -214,8 +214,12 @@ stdenv.mkDerivation rec {
./darwin_sleep.patch

# Make DARWIN_XCODE_LOCATOR_COMPILE_COMMAND behave properly by diabling
# multi-arch support (I could not get it to work) and using proper /usr/bin
# paths that will get fixed below.
# multi-arch support and using proper /usr/bin paths that will get fixed
# below.
# Also, xcode_locator requires arc support, but it seems pretty difficult
# to provide, so we disable it altogether for xcode_locator. Caveat: this
# leaks memory, but we accept this fact because xcode_locator is only a
# short-lived process used during the build.
./xcode_locator.patch

# On Darwin, the last argument to gcc is coming up as an empty string. i.e: ''
Original file line number Diff line number Diff line change
@@ -14,3 +14,30 @@ index 0358fb0ffe..baae1bf65b 100644
"""

genrule(
diff --git a/tools/osx/xcode_configure.bzl b/tools/osx/xcode_configure.bzl
index a4a712a341..dfbf4869a9 100644
--- a/tools/osx/xcode_configure.bzl
+++ b/tools/osx/xcode_configure.bzl
@@ -135,7 +135,6 @@ def run_xcode_locator(repository_ctx, xcode_locator_src_label):
"macosx",
"clang",
"-mmacosx-version-min=10.13",
- "-fobjc-arc",
"-framework",
"CoreServices",
"-framework",
diff --git a/tools/osx/xcode_locator.m b/tools/osx/xcode_locator.m
index c602b0bb4b..1f7eb64810 100644
--- a/tools/osx/xcode_locator.m
+++ b/tools/osx/xcode_locator.m
@@ -21,10 +21,6 @@
// 6,6.4,6.4.1 = 6.4.1
// 6.3,6.3.0 = 6.3

-#if !defined(__has_feature) || !__has_feature(objc_arc)
-#error "This file requires ARC support."
-#endif
-
#import <CoreServices/CoreServices.h>
#import <Foundation/Foundation.h>

0 comments on commit 6d93cdd

Please sign in to comment.