Skip to content

Revert "cmake: set up build-script support for swift-build-sdk-interfaces" #593

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.

Sign up for GitHub

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

Closed
wants to merge 1 commit into from
Closed

Revert "cmake: set up build-script support for swift-build-sdk-interfaces" #593

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 0 additions & 1 deletion Sources/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,5 @@ add_subdirectory(CSwiftScan)
add_subdirectory(SwiftOptions)
add_subdirectory(SwiftDriver)
add_subdirectory(SwiftDriverExecution)
add_subdirectory(swift-build-sdk-interfaces)
add_subdirectory(swift-driver)
add_subdirectory(swift-help)
13 changes: 0 additions & 13 deletions Sources/swift-build-sdk-interfaces/CMakeLists.txt
View file
Open in desktop

This file was deleted.

11 changes: 0 additions & 11 deletions Sources/swift-build-sdk-interfaces/main.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,3 @@
//===--------------- main.swift - swift-build-sdk-interfaces ------------===//
//
// This source file is part of the Swift.org open source project
//
// Copyright (c) 2014 - 2021 Apple Inc. and the Swift project authors
// Licensed under Apache License v2.0 with Runtime Library Exception
//
// See https://swift.org/LICENSE.txt for license information
// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
//
//===----------------------------------------------------------------------===//
import SwiftDriverExecution
import SwiftDriver
import TSCLibc
Expand Down
6 changes: 2 additions & 4 deletions Utilities/build-script-helper.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,6 @@ def error(message):
driver_toolchain_tools = ['swift', 'swift-frontend', 'clang', 'swift-help',
'swift-autolink-extract', 'lldb']

executables_to_install = ['swift-driver', 'swift-help', 'swift-build-sdk-interfaces']

def mkdir_p(path):
"""Create the given directory, if it does not exist."""
try:
Expand Down Expand Up @@ -213,7 +211,7 @@ def handle_invocation(args):
# TODO: Unify CMake-based installation flow used on Darwin with this
def non_darwin_install(swiftpm_bin_path, toolchain, verbose):
toolchain_bin = os.path.join(toolchain, 'bin')
for exe in executables_to_install:
for exe in ['swift-driver', 'swift-help']:
install_binary(exe, swiftpm_bin_path, toolchain_bin, verbose)

def install(args, build_dir, targets):
Expand Down Expand Up @@ -252,7 +250,7 @@ def install_swiftdriver(args, build_dir, prefix, targets) :
# Install universal binaries for swift-driver and swift-help into the toolchain bin
# directory
def install_executables(args, build_dir, universal_bin_dir, toolchain_bin_dir, targets):
for exe in executables_to_install:
for exe in ['swift-driver', 'swift-help']:
# Fixup rpaths
for target in targets:
exe_bin_path = os.path.join(build_dir, target,
Expand Down