forked from mirrors/nixpkgs
b461c9e5bc
* use default stdenv (clang 7) * add no-arc.patch to make the xcode_locate tool compile without libarc-lite * remove the `-mmacosx-version-min=10.9` flag from the bootstrap compile script
35 lines
1.1 KiB
Diff
35 lines
1.1 KiB
Diff
--- a/tools/osx/xcode_locator.m 2020-12-10 13:27:29.000000000 +0100
|
|
+++ b/tools/osx/xcode_locator.m 2021-02-01 09:09:32.159557051 +0100
|
|
@@ -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>
|
|
|
|
--- a/tools/osx/xcode_configure.bzl 1980-01-01 01:00:00.000000000 +0100
|
|
+++ b/tools/osx/xcode_configure.bzl 2021-02-01 09:36:57.773418444 +0100
|
|
@@ -123,7 +123,6 @@
|
|
"macosx",
|
|
"clang",
|
|
"-mmacosx-version-min=10.9",
|
|
- "-fobjc-arc",
|
|
"-framework",
|
|
"CoreServices",
|
|
"-framework",
|
|
--- a/tools/osx/BUILD 2021-02-01 11:01:02.191659553 +0100
|
|
+++ b/tools/osx/BUILD 2021-02-01 11:04:29.735071019 +0100
|
|
@@ -27,7 +27,7 @@
|
|
])
|
|
|
|
DARWIN_XCODE_LOCATOR_COMPILE_COMMAND = """
|
|
- /usr/bin/xcrun --sdk macosx clang -mmacosx-version-min=10.9 -fobjc-arc -framework CoreServices \
|
|
+ /usr/bin/xcrun --sdk macosx clang -mmacosx-version-min=10.9 -framework CoreServices \
|
|
-framework Foundation -o $@ $<
|
|
"""
|
|
|