Skip to content

Commit 12a472c

Browse files
author
Davide Italiano
committed
Revert "[lldb] Switch PR testing and build to use CMake by default."
This reverts commit 5dec537.
1 parent dacf0bb commit 12a472c

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

utils/build-presets.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -528,7 +528,7 @@ assertions
528528
test
529529
validation-test
530530

531-
llvm-targets-to-build=X86;ARM;AArch64;PowerPC
531+
llvm-targets-to-build=X86;AArch64;PowerPC
532532

533533
# Set the vendor to apple
534534
compiler-vendor=apple

utils/build-script-impl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ KNOWN_SETTINGS=(
7474
swift-stdlib-enable-assertions "1" "enable assertions in Swift"
7575
swift-stdlib-use-nonatomic-rc "0" "build the Swift stdlib and overlays with nonatomic reference count operations enabled"
7676
lldb-build-type "Debug" "the CMake build variant for LLDB"
77-
lldb-build-with-xcode "0" "Use xcodebuild to build LLDB, instead of CMake"
77+
lldb-build-with-xcode "1" "Use xcodebuild to build LLDB, instead of CMake"
7878
llbuild-build-type "Debug" "the CMake build variant for llbuild"
7979
foundation-build-type "Debug" "the build variant for Foundation"
8080
libdispatch-build-type "Debug" "the build variant for libdispatch"

utils/build_swift/driver_arguments.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ def _apply_default_arguments(args):
7777
args.lldb_build_variant = args.build_variant
7878

7979
if args.lldb_build_with_xcode is None:
80-
args.lldb_build_with_xcode = '0'
80+
args.lldb_build_with_xcode = '1'
8181

8282
if args.foundation_build_variant is None:
8383
args.foundation_build_variant = args.build_variant
@@ -629,11 +629,11 @@ def create_argument_parser():
629629
help='build the Debug variant of LLDB')
630630

631631
option('--lldb-build-with-xcode', store('lldb_build_with_xcode'),
632-
const='0',
632+
const='1',
633633
help='build LLDB using xcodebuild, if possible')
634634

635635
option('--lldb-build-with-cmake', store('lldb_build_with_xcode'),
636-
const='1',
636+
const='0',
637637
help='build LLDB using CMake')
638638

639639
option('--debug-cmark', store('cmark_build_variant'),

0 commit comments

Comments
 (0)