https://github.com/medismailben updated https://github.com/llvm/llvm-project/pull/172761
>From 3eafee9e991204a1f73c9f43359ce65aa27d54b5 Mon Sep 17 00:00:00 2001 From: Med Ismail Bennani <[email protected]> Date: Thu, 18 Dec 2025 00:38:30 +0100 Subject: [PATCH] [lldb/test] Fix libcxx configuration handling for remote platforms When using --platform remote-* options, explicitly clear the libcxx configuration variables instead of just warning and continuing with potentially set values. This prevents the test suite from attempting to use custom libcxx paths on remote platforms where they're not applicable. Also initialize libcxx variables to None when not specified, ensuring a clean state regardless of how the arguments are parsed. Signed-off-by: Med Ismail Bennani <[email protected]> --- lldb/packages/Python/lldbsuite/test/dotest.py | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/lldb/packages/Python/lldbsuite/test/dotest.py b/lldb/packages/Python/lldbsuite/test/dotest.py index f280bd2b3887b..fcd60a1bc0db8 100644 --- a/lldb/packages/Python/lldbsuite/test/dotest.py +++ b/lldb/packages/Python/lldbsuite/test/dotest.py @@ -290,15 +290,25 @@ def parseOptionsAndInitTestdirs(): logging.warning( "Custom libc++ is not supported for remote runs: ignoring --libcxx arguments" ) + # Don't set libcxx paths for remote platforms - use SDK's libc++ instead + configuration.libcxx_include_dir = None + configuration.libcxx_include_target_dir = None + configuration.libcxx_library_dir = None elif not (args.libcxx_include_dir and args.libcxx_library_dir): logging.error( "Custom libc++ requires both --libcxx-include-dir and --libcxx-library-dir" ) sys.exit(-1) else: + # Use custom libcxx for local runs configuration.libcxx_include_dir = args.libcxx_include_dir configuration.libcxx_include_target_dir = args.libcxx_include_target_dir configuration.libcxx_library_dir = args.libcxx_library_dir + else: + # No custom libcxx specified + configuration.libcxx_include_dir = None + configuration.libcxx_include_target_dir = None + configuration.libcxx_library_dir = None configuration.cmake_build_type = args.cmake_build_type.lower() @@ -312,7 +322,7 @@ def parseOptionsAndInitTestdirs(): lldbtest_config.out_of_tree_debugserver = args.out_of_tree_debugserver # Set SDKROOT if we are using an Apple SDK - if args.sysroot is not None: + if args.sysroot: configuration.sdkroot = args.sysroot elif platform_system == "Darwin" and args.apple_sdk: configuration.sdkroot = seven.get_command_output( _______________________________________________ lldb-commits mailing list [email protected] https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
