Skip to content

Commit 1096a05

Browse files
authored
Merge pull request swiftlang#73399 from etcwilde/ewilde/earlyswiftdriver-use-consistent-sdk
Build: EarlySwiftDriver: Use consistent Foundation/Dispatch
2 parents 625436a + f34d388 commit 1096a05

File tree

1 file changed

+0
-16
lines changed

1 file changed

+0
-16
lines changed

utils/swift_build_support/swift_build_support/products/earlyswiftdriver.py

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -107,14 +107,6 @@ def run_build_script_helper(action, host_target, product, args):
107107
swiftc_path = os.path.abspath(product.toolchain.swiftc)
108108
toolchain_path = os.path.dirname(os.path.dirname(swiftc_path))
109109

110-
# Pass Dispatch directory down if we built it
111-
dispatch_build_dir = os.path.join(
112-
build_root, '%s-%s' % ('libdispatch', host_target))
113-
114-
# Pass Foundation directory down if we built it
115-
foundation_build_dir = os.path.join(
116-
build_root, '%s-%s' % ('foundation', host_target))
117-
118110
# Pass the swift lit tests if we're testing and the Swift tests were built
119111
swift_build_dir = os.path.join(
120112
build_root, 'swift-{}'.format(host_target))
@@ -135,14 +127,6 @@ def run_build_script_helper(action, host_target, product, args):
135127
'--local_compiler_build'
136128
]
137129

138-
if os.path.exists(dispatch_build_dir):
139-
helper_cmd += [
140-
'--dispatch-build-dir', dispatch_build_dir
141-
]
142-
if os.path.exists(foundation_build_dir):
143-
helper_cmd += [
144-
'--foundation-build-dir', foundation_build_dir
145-
]
146130
if os.path.exists(lit_test_dir) and action == 'test':
147131
helper_cmd += [
148132
'--lit-test-dir', lit_test_dir

0 commit comments

Comments
 (0)