This revision was automatically updated to reflect the committed changes. Closed by commit rGd52866e1a82d: [lldb] Stop forwarding LLDB_DEFAULT_PYTHON_VERSION in crashlog (authored by JDevlieghere). Herald added a project: LLDB.
Repository: rG LLVM Github Monorepo CHANGES SINCE LAST ACTION https://reviews.llvm.org/D119756/new/ https://reviews.llvm.org/D119756 Files: lldb/examples/python/crashlog.py Index: lldb/examples/python/crashlog.py =================================================================== --- lldb/examples/python/crashlog.py +++ lldb/examples/python/crashlog.py @@ -49,11 +49,9 @@ except ImportError: # Ask the command line driver for the path to the lldb module. Copy over # the environment so that SDKROOT is propagated to xcrun. - env = os.environ.copy() - env['LLDB_DEFAULT_PYTHON_VERSION'] = str(sys.version_info.major) command = ['xcrun', 'lldb', '-P'] if platform.system() == 'Darwin' else ['lldb', '-P'] # Extend the PYTHONPATH if the path exists and isn't already there. - lldb_python_path = subprocess.check_output(command, env=env).decode("utf-8").strip() + lldb_python_path = subprocess.check_output(command).decode("utf-8").strip() if os.path.exists(lldb_python_path) and not sys.path.__contains__(lldb_python_path): sys.path.append(lldb_python_path) # Try importing LLDB again.
Index: lldb/examples/python/crashlog.py =================================================================== --- lldb/examples/python/crashlog.py +++ lldb/examples/python/crashlog.py @@ -49,11 +49,9 @@ except ImportError: # Ask the command line driver for the path to the lldb module. Copy over # the environment so that SDKROOT is propagated to xcrun. - env = os.environ.copy() - env['LLDB_DEFAULT_PYTHON_VERSION'] = str(sys.version_info.major) command = ['xcrun', 'lldb', '-P'] if platform.system() == 'Darwin' else ['lldb', '-P'] # Extend the PYTHONPATH if the path exists and isn't already there. - lldb_python_path = subprocess.check_output(command, env=env).decode("utf-8").strip() + lldb_python_path = subprocess.check_output(command).decode("utf-8").strip() if os.path.exists(lldb_python_path) and not sys.path.__contains__(lldb_python_path): sys.path.append(lldb_python_path) # Try importing LLDB again.
_______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits