Skip to content

Commit a890d8b

Browse files
authored
Merge pull request swiftlang#32503 from apple/update-5.3-xcode-12-beta
Update release/5.3 branch for Xcode 12 beta
2 parents 703f2c3 + f6aea0c commit a890d8b

File tree

288 files changed

+102
-47170
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

288 files changed

+102
-47170
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ Please make sure you use Python 2.x. Python 3.x is not supported currently.
9191

9292
#### macOS
9393

94-
To build for macOS, you need [Xcode 11.4](https://developer.apple.com/xcode/resources/).
94+
To build for macOS, you need [Xcode 12 beta](https://developer.apple.com/xcode/resources/).
9595
The required version of Xcode changes frequently, and is often a beta release.
9696
Check this document or the host information on <https://ci.swift.org> for the
9797
current required version.

benchmark/cmake/modules/AddSwiftBenchmarkSuite.cmake

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -660,8 +660,11 @@ function (swift_benchmark_compile_archopts)
660660
"-m${triple_platform}-version-min=${ver}"
661661
"-lobjc"
662662
"-L${SWIFT_LIBRARY_PATH}/${BENCH_COMPILE_ARCHOPTS_PLATFORM}"
663+
"-L${sdk}/usr/lib/swift"
663664
"-Xlinker" "-rpath"
664665
"-Xlinker" "${SWIFT_LINK_RPATH}"
666+
"-Xlinker" "-rpath"
667+
"-Xlinker" "/usr/lib/swift"
665668
${bench_library_objects}
666669
${bench_driver_objects}
667670
${ld64_add_ast_path_opts}

stdlib/cmake/modules/AddSwiftStdlib.cmake

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1101,6 +1101,8 @@ function(_add_swift_target_library_single target name)
11011101
list(APPEND library_search_directories "$ENV{SDKROOT}/usr/lib/swift")
11021102
endif()
11031103

1104+
list(APPEND library_search_directories "${SWIFT_SDK_${sdk}_ARCH_${arch}_PATH}/usr/lib/swift")
1105+
11041106
# Add variant-specific flags.
11051107
if(SWIFTLIB_SINGLE_TARGET_LIBRARY)
11061108
set(build_type "${SWIFT_STDLIB_BUILD_TYPE}")

stdlib/public/Darwin/ARKit/ARKit.swift

Lines changed: 0 additions & 249 deletions
This file was deleted.

stdlib/public/Darwin/ARKit/CMakeLists.txt

Lines changed: 0 additions & 18 deletions
This file was deleted.

stdlib/public/Darwin/AVFoundation/AVCaptureDevice.swift

Lines changed: 0 additions & 37 deletions
This file was deleted.

0 commit comments

Comments
 (0)