Skip to content

build-script: always use the just-built swift compiler to build SwiftSyntax. #23

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
Nov 2, 2018
Merged

build-script: always use the just-built swift compiler to build SwiftSyntax. #23

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
12 changes: 7 additions & 5 deletions build-script.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,10 @@ def call(cmd, env=os.environ, stdout=None, stderr=subprocess.STDOUT,
return process.returncode


def check_call(cmd, verbose=False):
def check_call(cmd, env=os.environ, verbose=False):
if verbose:
print(' '.join([escapeCmdArg(arg) for arg in cmd]))
return subprocess.check_call(cmd, stderr=subprocess.STDOUT)
return subprocess.check_call(cmd, env=env, stderr=subprocess.STDOUT)


def realpath(path):
Expand Down Expand Up @@ -146,7 +146,7 @@ def get_swiftpm_invocation(spm_exec, build_dir, release):
return swiftpm_call


def build_swiftsyntax(swift_build_exec, build_dir, build_test_util, release,
def build_swiftsyntax(swift_build_exec, swiftc_exec, build_dir, build_test_util, release,
verbose):
print('** Building SwiftSyntax **')

Expand All @@ -161,8 +161,9 @@ def build_swiftsyntax(swift_build_exec, build_dir, build_test_util, release,

if verbose:
swiftpm_call.extend(['--verbose'])

check_call(swiftpm_call, verbose=verbose)
_environ = dict(os.environ)
_environ['SWIFT_EXEC'] = swiftc_exec
check_call(swiftpm_call, env=_environ, verbose=verbose)


## Testing
Expand Down Expand Up @@ -365,6 +366,7 @@ def main():

try:
build_swiftsyntax(swift_build_exec=args.swift_build_exec,
swiftc_exec=args.swiftc_exec,
build_dir=args.build_dir,
build_test_util=args.test,
release=args.release,
Expand Down