tjh.dev
Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)
1diff --git a/tools/osx/BUILD b/tools/osx/BUILD
2index 990afe3e8c..cd5b7b1b7a 100644
3--- a/tools/osx/BUILD
4+++ b/tools/osx/BUILD
5@@ -28,8 +28,8 @@ exports_files([
6 ])
7
8 DARWIN_XCODE_LOCATOR_COMPILE_COMMAND = """
9- /usr/bin/xcrun --sdk macosx clang -mmacosx-version-min=10.13 -fobjc-arc -framework CoreServices \
10- -framework Foundation -arch arm64 -arch x86_64 -Wl,-no_adhoc_codesign -Wl,-no_uuid -o $@ $< && \
11+ /usr/bin/xcrun --sdk macosx clang -mmacosx-version-min=10.13 -framework CoreServices \
12+ -framework Foundation -arch @multiBinPatch@ -Wl,-no_uuid -o $@ $< && \
13 env -i codesign --identifier $@ --force --sign - $@
14 """
15
16diff --git a/tools/osx/xcode_configure.bzl b/tools/osx/xcode_configure.bzl
17index 2b819f07ec..a98ce37673 100644
18--- a/tools/osx/xcode_configure.bzl
19+++ b/tools/osx/xcode_configure.bzl
20@@ -127,7 +127,6 @@ def run_xcode_locator(repository_ctx, xcode_locator_src_label):
21 "macosx",
22 "clang",
23 "-mmacosx-version-min=10.13",
24- "-fobjc-arc",
25 "-framework",
26 "CoreServices",
27 "-framework",
28diff --git a/tools/osx/xcode_locator.m b/tools/osx/xcode_locator.m
29index ed2ef87453..e0ce6dbdd1 100644
30--- a/tools/osx/xcode_locator.m
31+++ b/tools/osx/xcode_locator.m
32@@ -21,10 +21,6 @@
33 // 6,6.4,6.4.1 = 6.4.1
34 // 6.3,6.3.0 = 6.3
35
36-#if !defined(__has_feature) || !__has_feature(objc_arc)
37-#error "This file requires ARC support."
38-#endif
39-
40 #import <CoreServices/CoreServices.h>
41 #import <Foundation/Foundation.h>
42