Skip to content

[embedded] Don't build embedded stdlibs in 'standalone' builds #75569

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
Jul 31, 2024
Merged

[embedded] Don't build embedded stdlibs in 'standalone' builds #75569

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
69964f9
[embedded] Don't build embedded stdlibs in 'standalone' builds
kubamracek Jul 30, 2024
c9513c7
[embedded] Add missing option to expected_options.py
kubamracek Jul 30, 2024
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
1 change: 1 addition & 0 deletions utils/build-presets.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2596,6 +2596,7 @@ build-swift-tools=0
build-swift-libexec=0
skip-early-swift-driver
skip-early-swiftsyntax
build-embedded-stdlib=0

# Then set the paths to our native tools. If compiling against a toolchain,
# these should all be the ./usr/bin directory.
Expand Down
4 changes: 4 additions & 0 deletions utils/build_swift/build_swift/driver_arguments.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1137,6 +1137,10 @@ def create_argument_parser():
option('--build-swift-stdlib-static-print', toggle_true,
help='Build constant-folding print() support')

option('--build-embedded-stdlib', toggle_true,
default=True,
help='Build embedded stdlib')

option('--build-embedded-stdlib-cross-compiling', toggle_true,
help='Build embedded stdlib for cross-compiling targets.')

Expand Down
2 changes: 2 additions & 0 deletions utils/build_swift/tests/expected_options.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,7 @@
'build_swift_stdlib_unittest_extra': False,
'build_swift_stdlib_static_print': False,
'build_swift_stdlib_unicode_data': True,
'build_embedded_stdlib': True,
'build_embedded_stdlib_cross_compiling': False,
'build_swift_clang_overlays': True,
'build_swift_remote_mirror': True,
Expand Down Expand Up @@ -597,6 +598,7 @@ class BuildScriptImplOption(_BaseOption):
EnableOption('--build-toolchain-only'),
EnableOption('--build-swift-private-stdlib'),
EnableOption('--build-swift-stdlib-unicode-data'),
EnableOption('--build-embedded-stdlib'),
EnableOption('--build-embedded-stdlib-cross-compiling'),
EnableOption('--build-swift-libexec'),
EnableOption('--build-swift-clang-overlays'),
Expand Down
7 changes: 7 additions & 0 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 @@ -85,6 +85,8 @@ def __init__(self, args, toolchain, source_dir, build_dir):

self.cmake_options.extend(self._enable_stdlib_unicode_data)

self.cmake_options.extend(self._enable_embedded_stdlib)

self.cmake_options.extend(self._enable_embedded_stdlib_cross_compiling)

self.cmake_options.extend(
Expand Down Expand Up @@ -259,6 +261,11 @@ def _enable_experimental_parser_validation(self):
return [('SWIFT_ENABLE_EXPERIMENTAL_PARSER_VALIDATION:BOOL',
self.args.enable_experimental_parser_validation)]

@property
def _enable_embedded_stdlib(self):
return [('SWIFT_SHOULD_BUILD_EMBEDDED_STDLIB',
self.args.build_embedded_stdlib)]

@property
def _enable_embedded_stdlib_cross_compiling(self):
return [('SWIFT_SHOULD_BUILD_EMBEDDED_STDLIB_CROSS_COMPILING',
Expand Down
3 changes: 3 additions & 0 deletions utils/swift_build_support/tests/products/test_swift.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ def setUp(self):
build_early_swiftsyntax=False,
build_swift_stdlib_static_print=False,
build_swift_stdlib_unicode_data=True,
build_embedded_stdlib=True,
build_embedded_stdlib_cross_compiling=False,
swift_freestanding_is_darwin=False,
build_swift_private_stdlib=True,
Expand Down Expand Up @@ -116,6 +117,7 @@ def test_by_default_no_cmake_options(self):
'-DSWIFT_FREESTANDING_IS_DARWIN:BOOL=FALSE',
'-DSWIFT_STDLIB_BUILD_PRIVATE:BOOL=TRUE',
'-DSWIFT_STDLIB_ENABLE_UNICODE_DATA=TRUE',
'-DSWIFT_SHOULD_BUILD_EMBEDDED_STDLIB=TRUE',
'-DSWIFT_SHOULD_BUILD_EMBEDDED_STDLIB_CROSS_COMPILING=FALSE',
'-DSWIFT_TOOLS_LD64_LTO_CODEGEN_ONLY_FOR_SUPPORTING_TARGETS:BOOL=FALSE',
'-USWIFT_DEBUGINFO_NON_LTO_ARGS'
Expand Down Expand Up @@ -149,6 +151,7 @@ def test_swift_runtime_tsan(self):
'-DSWIFT_FREESTANDING_IS_DARWIN:BOOL=FALSE',
'-DSWIFT_STDLIB_BUILD_PRIVATE:BOOL=TRUE',
'-DSWIFT_STDLIB_ENABLE_UNICODE_DATA=TRUE',
'-DSWIFT_SHOULD_BUILD_EMBEDDED_STDLIB=TRUE',
'-DSWIFT_SHOULD_BUILD_EMBEDDED_STDLIB_CROSS_COMPILING=FALSE',
'-DSWIFT_TOOLS_LD64_LTO_CODEGEN_ONLY_FOR_SUPPORTING_TARGETS:BOOL=FALSE',
'-USWIFT_DEBUGINFO_NON_LTO_ARGS'
Expand Down