@@ -2503,68 +2503,47 @@ for host in "${ALL_HOSTS[@]}"; do
2503
2503
# Get the build date
2504
2504
LLDB_BUILD_DATE=$( date +%Y-%m-%d)
2505
2505
2506
- case " ${host} " in
2507
- cygwin-* |freebsd-* |haiku-* |linux-* )
2508
- cmake_options=(
2509
- " ${cmake_options[@]} "
2510
- -DCMAKE_BUILD_TYPE:STRING=" ${LLDB_BUILD_TYPE} "
2511
- -DLLDB_SWIFTC:PATH=" $( build_directory ${LOCAL_HOST} swift) /bin/swiftc"
2512
- -DLLDB_SWIFT_LIBS:PATH=" $( build_directory ${LOCAL_HOST} swift) /lib/swift"
2513
- -DCMAKE_INSTALL_PREFIX:PATH=" $( get_host_install_prefix ${host} ) "
2514
- -DLLDB_PATH_TO_LLVM_SOURCE:PATH=" ${LLVM_SOURCE_DIR} "
2515
- -DLLDB_PATH_TO_CLANG_SOURCE:PATH=" ${CLANG_SOURCE_DIR} "
2516
- -DLLDB_PATH_TO_SWIFT_SOURCE:PATH=" ${SWIFT_SOURCE_DIR} "
2517
- -DLLDB_PATH_TO_LLVM_BUILD:PATH=" ${llvm_build_dir} "
2518
- -DLLDB_PATH_TO_CLANG_BUILD:PATH=" ${llvm_build_dir} "
2519
- -DLLDB_PATH_TO_SWIFT_BUILD:PATH=" ${swift_build_dir} "
2520
- -DLLDB_IS_BUILDBOT_BUILD=" ${LLDB_IS_BUILDBOT_BUILD} "
2521
- -DLLDB_BUILD_DATE:STRING=" \" ${LLDB_BUILD_DATE} \" "
2522
- -DLLDB_ALLOW_STATIC_BINDINGS=1
2523
- )
2524
- ;;
2525
- macosx-* )
2526
- if [[ " $( true_false ${LLDB_BUILD_WITH_XCODE} ) " == " TRUE" ]] ; then
2527
- # Set up flags to pass to xcodebuild
2528
- set_lldb_xcodebuild_options
2529
- set_lldb_build_mode
2530
- with_pushd ${source_dir} \
2531
- call xcodebuild -target desktop -configuration ${LLDB_BUILD_MODE} ${lldb_xcodebuild_options[@]}
2532
- continue
2533
- else
2534
- cmake_options=(
2535
- " ${cmake_options[@]} "
2536
- -DCMAKE_BUILD_TYPE:STRING=" ${LLDB_BUILD_TYPE} "
2537
- -DLLDB_SWIFTC:PATH=" $( build_directory ${LOCAL_HOST} swift) /bin/swiftc"
2538
- -DLLDB_SWIFT_LIBS:PATH=" $( build_directory ${LOCAL_HOST} swift) /lib/swift"
2539
- -DCMAKE_INSTALL_PREFIX:PATH=" $( get_host_install_prefix ${host} ) "
2540
- -DLLDB_PATH_TO_LLVM_SOURCE:PATH=" ${LLVM_SOURCE_DIR} "
2541
- -DLLDB_PATH_TO_CLANG_SOURCE:PATH=" ${CLANG_SOURCE_DIR} "
2542
- -DLLDB_PATH_TO_SWIFT_SOURCE:PATH=" ${SWIFT_SOURCE_DIR} "
2543
- -DLLDB_PATH_TO_LLVM_BUILD:PATH=" ${llvm_build_dir} "
2544
- -DLLDB_PATH_TO_CLANG_BUILD:PATH=" ${llvm_build_dir} "
2545
- -DLLDB_PATH_TO_SWIFT_BUILD:PATH=" ${swift_build_dir} "
2546
- -DLLDB_BUILD_FRAMEWORK:BOOL=TRUE
2547
- -DLLDB_IS_BUILDBOT_BUILD=" ${LLDB_IS_BUILDBOT_BUILD} "
2548
- -DLLDB_BUILD_DATE:STRING=" \" ${LLDB_BUILD_DATE} \" "
2549
- -DLLDB_ALLOW_STATIC_BINDINGS=1
2550
- -DLLDB_CODESIGN_IDENTITY=" "
2551
- )
2552
-
2553
- if [[ " ${ENABLE_ASAN} " ]] ; then
2554
- # Limit the number of parallel tests.
2555
- LLVM_LIT_ARGS=" ${LLVM_LIT_ARGS} --threads=$( sysctl hw.physicalcpu | awk ' {print $2}' ) "
2556
- fi
2557
- fi
2558
- ;;
2559
- esac
2560
- if [[ " ${BUILD_TOOLCHAIN_ONLY} " ]]; then
2561
- cmake_options+=(
2562
- -DLLDB_INCLUDE_TESTS=NO
2563
- )
2506
+ using_xcodebuild=" FALSE"
2507
+ if [[ " $( uname -s) " == " Darwin" && " $( true_false ${LLDB_BUILD_WITH_XCODE} ) " == " TRUE" ]] ; then
2508
+ using_xcodebuild=" TRUE"
2509
+ fi
2510
+
2511
+ if [[ " ${using_xcodebuild} " == " TRUE" ]] ; then
2512
+ # Set up flags to pass to xcodebuild
2513
+ set_lldb_xcodebuild_options
2514
+ set_lldb_build_mode
2515
+ with_pushd ${source_dir} \
2516
+ call xcodebuild -target desktop -configuration ${LLDB_BUILD_MODE} ${lldb_xcodebuild_options[@]}
2517
+ continue
2564
2518
else
2519
+ cmake_options=(
2520
+ " ${cmake_options[@]} "
2521
+ -DCMAKE_BUILD_TYPE:STRING=" ${LLDB_BUILD_TYPE} "
2522
+ -DLLDB_SWIFTC:PATH=" $( build_directory ${LOCAL_HOST} swift) /bin/swiftc"
2523
+ -DLLDB_SWIFT_LIBS:PATH=" $( build_directory ${LOCAL_HOST} swift) /lib/swift"
2524
+ -DCMAKE_INSTALL_PREFIX:PATH=" $( get_host_install_prefix ${host} ) "
2525
+ -DLLDB_PATH_TO_LLVM_SOURCE:PATH=" ${LLVM_SOURCE_DIR} "
2526
+ -DLLDB_PATH_TO_CLANG_SOURCE:PATH=" ${CLANG_SOURCE_DIR} "
2527
+ -DLLDB_PATH_TO_SWIFT_SOURCE:PATH=" ${SWIFT_SOURCE_DIR} "
2528
+ -DLLDB_PATH_TO_LLVM_BUILD:PATH=" ${llvm_build_dir} "
2529
+ -DLLDB_PATH_TO_CLANG_BUILD:PATH=" ${llvm_build_dir} "
2530
+ -DLLDB_PATH_TO_SWIFT_BUILD:PATH=" ${swift_build_dir} "
2531
+ -DLLDB_IS_BUILDBOT_BUILD:BOOL=" ${LLDB_IS_BUILDBOT_BUILD} "
2532
+ -DLLDB_BUILD_DATE:STRING=" \" ${LLDB_BUILD_DATE} \" "
2533
+ -DLLDB_ALLOW_STATIC_BINDINGS:BOOL=1
2534
+ -DLLDB_INCLUDE_TESTS:BOOL=$( false_true ${BUILD_TOOLCHAIN_ONLY} )
2535
+ )
2536
+
2537
+ if [[ ${LLDB_BUILD_ON_MACOS} ]] ; then
2565
2538
cmake_options+=(
2566
- -DLLDB_INCLUDE_TESTS=YES
2539
+ -DLLDB_BUILD_FRAMEWORK:BOOL=TRUE
2540
+ -DLLDB_CODESIGN_IDENTITY=" "
2567
2541
)
2542
+ if " ${ENABLE_ASAN} " ]] ; then
2543
+ # Limit the number of parallel tests
2544
+ LLVM_LIT_ARGS=" ${LLVM_LIT_ARGS} --threads=$( sysctl hw.physicalcpu | awk ' { print $2 }' ) "
2545
+ fi
2546
+ fi
2568
2547
fi
2569
2548
;;
2570
2549
llbuild)
0 commit comments