Skip to content

Commit 27a96cc

Browse files
author
AlexDenisov
authored
Merge pull request #20 from dsp-testing/alexdenisov/swift-5.9
Swift 5.9
2 parents de78110 + 6ece629 commit 27a96cc

File tree

2 files changed

+0
-26
lines changed

2 files changed

+0
-26
lines changed

patches/swift/handle-empty-pattern-list.patch

-19
This file was deleted.

pkg_swift_llvm.py

-7
Original file line numberDiff line numberDiff line change
@@ -136,11 +136,6 @@ def export_sdk(tgt, swift_source_tree, swift_build_tree):
136136
ignore=shutil.ignore_patterns('CMakeLists.txt'))
137137

138138

139-
def export_toolchain(tgt, toolchain_dir):
140-
print("assembling toolchain")
141-
shutil.copytree(toolchain_dir, tgt)
142-
143-
144139
def export_stdlibs(exported_dir, swift_build_tree):
145140
ext = 'dylib'
146141
platform = 'linux' if get_platform() == 'linux' else 'macosx'
@@ -195,7 +190,6 @@ def main(opts):
195190
os.mkdir(tmp)
196191
llvm_build_tree = next(opts.build_tree.glob("llvm-*"))
197192
swift_build_tree = next(opts.build_tree.glob("swift-*"))
198-
toolchain_dir = next(opts.build_tree.glob("toolchain-*/codeql-toolchain"))
199193
earlyswiftsyntax_build_tree = next(opts.build_tree.glob("earlyswiftsyntax-*"))
200194
configured = configure_dummy_project(tmp, prefixes=[llvm_build_tree, swift_build_tree,
201195
earlyswiftsyntax_build_tree / "cmake" / "modules"])
@@ -206,7 +200,6 @@ def main(opts):
206200
export_libs(exported, libs, swift_build_tree)
207201
export_headers(exported, opts.swift_source_tree, llvm_build_tree, swift_build_tree)
208202
export_sdk(exported / "sdk", opts.swift_source_tree, swift_build_tree)
209-
export_toolchain(exported / "toolchain", toolchain_dir)
210203

211204
zip_dir(exported, opts.output)
212205

0 commit comments

Comments
 (0)