@@ -1025,13 +1025,6 @@ function cmake_needs_to_specify_standard_computed_defaults() {
1025
1025
fi
1026
1026
}
1027
1027
1028
- function copy_swift_stdlib_tool_substitute() {
1029
- if [ ! -f " $1 " ] ; then
1030
- echo " --- Copy swift-stdlib-tool ---"
1031
- call cp " ${SWIFT_SOURCE_DIR} /utils/swift-stdlib-tool-substitute" " $1 "
1032
- fi
1033
- }
1034
-
1035
1028
function make_relative_symlink() {
1036
1029
local SOURCE=$1
1037
1030
local TARGET=$2
@@ -2362,15 +2355,6 @@ for host in "${ALL_HOSTS[@]}"; do
2362
2355
LIBDISPATCH_BUILD_ARGS=" --libdispatch-src-dir=${LIBDISPATCH_SOURCE_DIR} --libdispatch-build-dir=${LIBDISPATCH_BUILD_DIR} "
2363
2356
fi
2364
2357
2365
- if [[ " $( uname -s) " == " Darwin" ]] ; then
2366
- # xcodebuild requires swift-stdlib-tool to build a Swift
2367
- # framework. This is normally present when building XCTest
2368
- # via a packaged .xctoolchain, but here we are using the
2369
- # swiftc that was just built--no toolchain exists yet. As a
2370
- # result, we must copy swift-stdlib-tool ourselves.
2371
- copy_swift_stdlib_tool_substitute " $( build_directory_bin ${host} swift) /swift-stdlib-tool"
2372
- fi
2373
-
2374
2358
# Use XCTEST_BUILD_TYPE to build either --debug or --release.
2375
2359
if [[ " ${XCTEST_BUILD_TYPE} " == " Debug" ]] ; then
2376
2360
XCTEST_BUILD_ARGS=" --debug"
@@ -3260,8 +3244,6 @@ function build_and_test_installable_package() {
3260
3244
3261
3245
# Assume the lipo builds are (or include) an OS X host and build an xctoolchain
3262
3246
if [[ " ${host} " == " macosx-" * ]] || [[ " ${host} " == " merged-hosts" ]]; then
3263
- copy_swift_stdlib_tool_substitute " ${host_install_destdir}${host_install_prefix} /bin/swift-stdlib-tool"
3264
-
3265
3247
# Create plist for xctoolchain.
3266
3248
echo " -- Create Info.plist --"
3267
3249
PLISTBUDDY_BIN=" /usr/libexec/PlistBuddy"
0 commit comments