Skip to content

Commit 1407980

Browse files
authored
Don't pass foundation build path to swift-driver/swift-package-manager (#74217)
1 parent 7743741 commit 1407980

File tree

2 files changed

+0
-17
lines changed

2 files changed

+0
-17
lines changed

utils/swift_build_support/swift_build_support/products/swiftdriver.py

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -92,10 +92,6 @@ def run_build_script_helper(action, host_target, product, args):
9292
dispatch_build_dir = os.path.join(
9393
build_root, '%s-%s' % ('libdispatch', host_target))
9494

95-
# Pass Foundation directory down if we built it
96-
foundation_build_dir = os.path.join(
97-
build_root, '%s-%s' % ('foundation', host_target))
98-
9995
# Pass the swift lit tests if we're testing and the Swift tests were built
10096
swift_build_dir = os.path.join(
10197
build_root, 'swift-{}'.format(host_target))
@@ -118,10 +114,6 @@ def run_build_script_helper(action, host_target, product, args):
118114
helper_cmd += [
119115
'--dispatch-build-dir', dispatch_build_dir
120116
]
121-
if os.path.exists(foundation_build_dir):
122-
helper_cmd += [
123-
'--foundation-build-dir', foundation_build_dir
124-
]
125117
if os.path.exists(lit_test_dir) and action == 'test':
126118
helper_cmd += [
127119
'--lit-test-dir', lit_test_dir

utils/swift_build_support/swift_build_support/products/swiftpm.py

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -84,15 +84,6 @@ def run_bootstrap_script(self, action, host_target, additional_params=[]):
8484
"--dispatch-build-dir", dispatch_build_dir
8585
]
8686

87-
# Pass Foundation directory down if we built it
88-
foundation_build_dir = os.path.join(
89-
build_root, '%s-%s' % ("foundation", host_target))
90-
91-
if os.path.exists(foundation_build_dir):
92-
helper_cmd += [
93-
"--foundation-build-dir", foundation_build_dir
94-
]
95-
9687
# Pass Cross compile host info
9788
if self.has_cross_compile_hosts():
9889
if self.is_darwin_host(host_target):

0 commit comments

Comments
 (0)