Skip to content

[Build] Determine the early SwiftSyntax build directory in build-script-impl #61211

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 2 commits into from
Sep 21, 2022
Merged

[Build] Determine the early SwiftSyntax build directory in build-script-impl #61211

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b626f46
[Build] Determine the early SwiftSyntax build directory in build-scri…
DougGregor Sep 20, 2022
b037a7c
Remove unused import
DougGregor Sep 20, 2022
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: 12 additions & 0 deletions utils/build-script-impl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,6 +230,7 @@ KNOWN_SETTINGS=(
swift-disable-dead-stripping "0" "turns off Darwin-specific dead stripping for Swift host tools"
common-swift-flags "" "Flags used for Swift targets other than the stdlib, like the corelibs"
swift-enable-experimental-string-processing "1" "whether to build experimental string processing feature"
swift-earlyswiftsyntax "0" "use the early SwiftSyntax"

## FREESTANDING Stdlib Options
swift-freestanding-flavor "" "when building the FREESTANDING stdlib, which build style to use (options: apple, linux)"
Expand Down Expand Up @@ -850,6 +851,16 @@ function set_build_options_for_host() {
swift_cmake_options+=(
-DCOVERAGE_DB="${COVERAGE_DB}"
)

if [[ "$(true_false ${SWIFT_EARLYSWIFTSYNTAX})" == "TRUE" ]]; then
early_swiftsyntax_build_dir="$(build_directory ${host} earlyswiftsyntax)"
swift_cmake_options+=(
-DSWIFT_PATH_TO_EARLYSWIFTSYNTAX_BUILD_DIR:PATH="${early_swiftsyntax_build_dir}"
)
lldb_cmake_options+=(
-DSWIFT_PATH_TO_EARLYSWIFTSYNTAX_BUILD_DIR:PATH="${early_swiftsyntax_build_dir}"
)
fi
}

function configure_default_options() {
Expand Down Expand Up @@ -1233,6 +1244,7 @@ LIBDISPATCH_STATIC_SOURCE_DIR="${WORKSPACE}/swift-corelibs-libdispatch"
LIBICU_SOURCE_DIR="${WORKSPACE}/icu"
LIBCXX_SOURCE_DIR="${WORKSPACE}/llvm-project/runtimes"
EXPERIMENTAL_STRING_PROCESSING_SOURCE_DIR="${WORKSPACE}/swift-experimental-string-processing"
SWIFTSYNTAX_SOURCE_DIR="${WORKSPACE}/swift-syntax"
LIBXML2_SOURCE_DIR="${WORKSPACE}/libxml2"
SWIFT_SYNTAX_SOURCE_DIR="${WORKSPACE}/swift-syntax"

Expand Down
7 changes: 1 addition & 6 deletions utils/swift_build_support/swift_build_support/build_script_invocation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,12 +252,7 @@ def convert_to_impl_arguments(self):
'-DSWIFT_PATH_TO_SWIFT_SYNTAX_SOURCE:PATH={}'.format(swift_syntax_src))

if args.build_early_swiftsyntax:
early_swiftsyntax_build_dir = os.path.join(
self.workspace.build_root,
'%s-%s' % ('earlyswiftsyntax', self.args.host_target))
args.extra_cmake_options.append(
'-DSWIFT_PATH_TO_EARLYSWIFTSYNTAX_BUILD_DIR:PATH={}'
.format(early_swiftsyntax_build_dir))
impl_args += ["--swift-earlyswiftsyntax"]

# Then add subproject install flags that either skip building them /or/
# if we are going to build them and install_all is set, we also install
Expand Down
17 changes: 0 additions & 17 deletions utils/swift_build_support/swift_build_support/products/swift.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@
#
# ----------------------------------------------------------------------------

import os

from . import cmark
from . import earlyswiftdriver
from . import libcxx
Expand Down Expand Up @@ -57,9 +55,6 @@ def __init__(self, args, toolchain, source_dir, build_dir):
# Add experimental distributed flag.
self.cmake_options.extend(self._enable_experimental_distributed)

# Add path for the early SwiftSyntax build.
self.cmake_options.extend(self._early_swiftsyntax_flags)

# Add static vprintf flag
self.cmake_options.extend(self._enable_stdlib_static_vprintf)

Expand Down Expand Up @@ -172,18 +167,6 @@ def _enable_experimental_distributed(self):
return [('SWIFT_ENABLE_EXPERIMENTAL_DISTRIBUTED:BOOL',
self.args.enable_experimental_distributed)]

@property
def _early_swiftsyntax_flags(self):
result = []
if self.args.build_early_swiftsyntax:
build_root = os.path.dirname(self.build_dir)
early_swiftsyntax_build_dir = os.path.join(
'..', build_root, '%s-%s' % ('earlyswiftsyntax',
self.args.host_target))
result.append(('SWIFT_PATH_TO_EARLYSWIFTSYNTAX_BUILD_DIR:PATH',
early_swiftsyntax_build_dir))
return result

@property
def _enable_stdlib_static_vprintf(self):
return [('SWIFT_STDLIB_STATIC_PRINT',
Expand Down