Skip to content

Update master branch for Xcode 12 beta #32502

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Jun 23, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ Please make sure you use Python 2.x. Python 3.x is not supported currently.

#### macOS

To build for macOS, you need [Xcode 11.4](https://developer.apple.com/xcode/resources/).
To build for macOS, you need [Xcode 12 beta](https://developer.apple.com/xcode/resources/).
The required version of Xcode changes frequently, and is often a beta release.
Check this document or the host information on <https://ci.swift.org> for the
current required version.
Expand Down
3 changes: 3 additions & 0 deletions benchmark/cmake/modules/AddSwiftBenchmarkSuite.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -660,8 +660,11 @@ function (swift_benchmark_compile_archopts)
"-m${triple_platform}-version-min=${ver}"
"-lobjc"
"-L${SWIFT_LIBRARY_PATH}/${BENCH_COMPILE_ARCHOPTS_PLATFORM}"
"-L${sdk}/usr/lib/swift"
"-Xlinker" "-rpath"
"-Xlinker" "${SWIFT_LINK_RPATH}"
"-Xlinker" "-rpath"
"-Xlinker" "/usr/lib/swift"
${bench_library_objects}
${bench_driver_objects}
${ld64_add_ast_path_opts}
Expand Down
2 changes: 2 additions & 0 deletions stdlib/cmake/modules/AddSwiftStdlib.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -1120,6 +1120,8 @@ function(_add_swift_target_library_single target name)
list(APPEND library_search_directories "$ENV{SDKROOT}/usr/lib/swift")
endif()

list(APPEND library_search_directories "${SWIFT_SDK_${sdk}_ARCH_${arch}_PATH}/usr/lib/swift")

# Add variant-specific flags.
if(SWIFTLIB_SINGLE_TARGET_LIBRARY)
set(build_type "${SWIFT_STDLIB_BUILD_TYPE}")
Expand Down
249 changes: 0 additions & 249 deletions stdlib/public/Darwin/ARKit/ARKit.swift

This file was deleted.

18 changes: 0 additions & 18 deletions stdlib/public/Darwin/ARKit/CMakeLists.txt

This file was deleted.

37 changes: 0 additions & 37 deletions stdlib/public/Darwin/AVFoundation/AVCaptureDevice.swift

This file was deleted.

Loading