Skip to content

Don't pass foundation build path to swift-driver/swift-package-manager #74217

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

Merged
merged 1 commit into from
Jun 10, 2024
Merged

Don't pass foundation build path to swift-driver/swift-package-manager #74217

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
8 changes: 0 additions & 8 deletions utils/swift_build_support/swift_build_support/products/swiftdriver.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,10 +92,6 @@ def run_build_script_helper(action, host_target, product, args):
dispatch_build_dir = os.path.join(
build_root, '%s-%s' % ('libdispatch', host_target))

# Pass Foundation directory down if we built it
foundation_build_dir = os.path.join(
build_root, '%s-%s' % ('foundation', host_target))

# Pass the swift lit tests if we're testing and the Swift tests were built
swift_build_dir = os.path.join(
build_root, 'swift-{}'.format(host_target))
Expand All @@ -118,10 +114,6 @@ def run_build_script_helper(action, host_target, product, args):
helper_cmd += [
'--dispatch-build-dir', dispatch_build_dir
]
if os.path.exists(foundation_build_dir):
helper_cmd += [
'--foundation-build-dir', foundation_build_dir
]
if os.path.exists(lit_test_dir) and action == 'test':
helper_cmd += [
'--lit-test-dir', lit_test_dir
Expand Down
9 changes: 0 additions & 9 deletions utils/swift_build_support/swift_build_support/products/swiftpm.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,15 +84,6 @@ def run_bootstrap_script(self, action, host_target, additional_params=[]):
"--dispatch-build-dir", dispatch_build_dir
]

# Pass Foundation directory down if we built it
foundation_build_dir = os.path.join(
build_root, '%s-%s' % ("foundation", host_target))

if os.path.exists(foundation_build_dir):
helper_cmd += [
"--foundation-build-dir", foundation_build_dir
]

# Pass Cross compile host info
if self.has_cross_compile_hosts():
if self.is_darwin_host(host_target):
Expand Down