Skip to content

[lldb] Switch PR testing and build to use CMake by default. #23908

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
Apr 24, 2019
Merged

[lldb] Switch PR testing and build to use CMake by default. #23908

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
5dec537
[lldb] Switch PR testing and build to use CMake by default.
Apr 9, 2019
5b5041d
[build-script] Fix defaults and unittests.
Apr 10, 2019
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
2 changes: 1 addition & 1 deletion utils/build-presets.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -528,7 +528,7 @@ assertions
test
validation-test

llvm-targets-to-build=X86;AArch64;PowerPC
llvm-targets-to-build=X86;ARM;AArch64;PowerPC

# Set the vendor to apple
compiler-vendor=apple
Expand Down
2 changes: 1 addition & 1 deletion utils/build-script-impl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ KNOWN_SETTINGS=(
swift-stdlib-enable-assertions "1" "enable assertions in Swift"
swift-stdlib-use-nonatomic-rc "0" "build the Swift stdlib and overlays with nonatomic reference count operations enabled"
lldb-build-type "Debug" "the CMake build variant for LLDB"
lldb-build-with-xcode "1" "Use xcodebuild to build LLDB, instead of CMake"
lldb-build-with-xcode "0" "Use xcodebuild to build LLDB, instead of CMake"
llbuild-build-type "Debug" "the CMake build variant for llbuild"
foundation-build-type "Debug" "the build variant for Foundation"
libdispatch-build-type "Debug" "the build variant for libdispatch"
Expand Down
2 changes: 1 addition & 1 deletion utils/build_swift/driver_arguments.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ def _apply_default_arguments(args):
args.lldb_build_variant = args.build_variant

if args.lldb_build_with_xcode is None:
args.lldb_build_with_xcode = '1'
args.lldb_build_with_xcode = '0'

if args.foundation_build_variant is None:
args.foundation_build_variant = args.build_variant
Expand Down
2 changes: 1 addition & 1 deletion utils/build_swift/tests/expected_options.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@
'llbuild_assertions': True,
'lldb_assertions': True,
'lldb_build_variant': 'Debug',
'lldb_build_with_xcode': '1',
'lldb_build_with_xcode': '0',
'llvm_assertions': True,
'llvm_build_variant': 'Debug',
'llvm_max_parallel_lto_link_jobs':
Expand Down