Skip to content

Don’t set SWIFT_BUILD_SCRIPT_ENVIRONMENT when building swift-format #251

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
Sep 16, 2023
Merged

Don’t set SWIFT_BUILD_SCRIPT_ENVIRONMENT when building swift-format #251

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
7 changes: 1 addition & 6 deletions build-script-helper.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,7 @@ def run(args):
if not args.no_local_deps:
env['SWIFTCI_USE_LOCAL_DEPS'] = "1"
env['SWIFT_STRESS_TESTER_SOURCEKIT_SEARCHPATH'] = args.sourcekitd_dir
env['SWIFT_SYNTAX_PARSER_LIB_SEARCH_PATH'] = os.path.join(args.toolchain, 'lib', 'swift', 'macosx')


if args.update:
print("** Updating dependencies of %s **" % package_name)
handle_errors(update_swiftpm_dependencies,
Expand Down Expand Up @@ -192,10 +191,6 @@ def invoke_swift_single_product(package_dir, swift_exec, action, product, build_
else:
args.extend(['--product', product])

# Tell SwiftSyntax that we are building in a build-script environment so that
# it does not need to rebuilt if it has already been built before.
env['SWIFT_BUILD_SCRIPT_ENVIRONMENT'] = '1'
Comment on lines -195 to -197
Copy link
Contributor

@bnbarham bnbarham Sep 15, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are you removing this from all the build script helpers? Will it just be set in solely swift-syntax/SwiftSyntaxDevUtils now?

Copy link
Member Author

@ahoppen ahoppen Sep 16, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, and then I’ll probably rename it to something more descriptive. This used to be used to set --check-exclusivity=unchecked, which decreased compile time of swift-syntax by 2 minute at some point but that’s no longer the case.


check_call(args, env=env, verbose=verbose)


Expand Down