Skip to content

Commit 84ea935

Browse files
committed
Remove swift-stdlib-tool-substitute
Ted added the real swift-stdlib-tool in PR #8258 (c317fcb), so there should no longer be a need for this substitute script.
1 parent e7390d1 commit 84ea935

File tree

2 files changed

+0
-97
lines changed

2 files changed

+0
-97
lines changed

utils/build-script-impl

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1025,13 +1025,6 @@ function cmake_needs_to_specify_standard_computed_defaults() {
10251025
fi
10261026
}
10271027

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-
10351028
function make_relative_symlink() {
10361029
local SOURCE=$1
10371030
local TARGET=$2
@@ -2362,15 +2355,6 @@ for host in "${ALL_HOSTS[@]}"; do
23622355
LIBDISPATCH_BUILD_ARGS="--libdispatch-src-dir=${LIBDISPATCH_SOURCE_DIR} --libdispatch-build-dir=${LIBDISPATCH_BUILD_DIR}"
23632356
fi
23642357

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-
23742358
# Use XCTEST_BUILD_TYPE to build either --debug or --release.
23752359
if [[ "${XCTEST_BUILD_TYPE}" == "Debug" ]] ; then
23762360
XCTEST_BUILD_ARGS="--debug"
@@ -3260,8 +3244,6 @@ function build_and_test_installable_package() {
32603244

32613245
# Assume the lipo builds are (or include) an OS X host and build an xctoolchain
32623246
if [[ "${host}" == "macosx-"* ]] || [[ "${host}" == "merged-hosts" ]]; then
3263-
copy_swift_stdlib_tool_substitute "${host_install_destdir}${host_install_prefix}/bin/swift-stdlib-tool"
3264-
32653247
# Create plist for xctoolchain.
32663248
echo "-- Create Info.plist --"
32673249
PLISTBUDDY_BIN="/usr/libexec/PlistBuddy"

utils/swift-stdlib-tool-substitute

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

0 commit comments

Comments
 (0)