diff --git a/lldb/scripts/Python/finish-swig-Python-LLDB.sh b/lldb/scripts/Python/finish-swig-Python-LLDB.sh index f294b6429bde..31bc2b349daf 100755 --- a/lldb/scripts/Python/finish-swig-Python-LLDB.sh +++ b/lldb/scripts/Python/finish-swig-Python-LLDB.sh @@ -179,7 +179,6 @@ then echo "Creating symlink for darwin-debug" fi cd "${framework_python_dir}" - ln -s "../../../../bin/lldb-launcher" darwin-debug else if [ $Debug -eq 1 ] then diff --git a/lldb/scripts/Python/finishSwigPythonLLDB.py b/lldb/scripts/Python/finishSwigPythonLLDB.py index 2c9d9f7044ba..91e3a41f9ed3 100644 --- a/lldb/scripts/Python/finishSwigPythonLLDB.py +++ b/lldb/scripts/Python/finishSwigPythonLLDB.py @@ -451,39 +451,6 @@ def make_symlink_liblldb( return (bOk, strErrMsg) -#++--------------------------------------------------------------------------- -# Details: Make the symbolic link to the darwin-debug. -# Args: vDictArgs - (R) Program input parameters. -# vstrFrameworkPythonDir - (R) Python framework directory. -# vstrDarwinDebugFileName - (R) File name for darwin-debug. -# Returns: Bool - True = function success, False = failure. -# Str - Error description on task failure. -# Throws: None. -#-- - - -def make_symlink_darwin_debug( - vDictArgs, - vstrFrameworkPythonDir, - vstrDarwinDebugFileName): - dbg = utilsDebug.CDebugFnVerbose( - "Python script make_symlink_darwin_debug()") - bOk = True - strErrMsg = "" - strTarget = vstrDarwinDebugFileName - strSrc = "" - - bMakeFileCalled = "-m" in vDictArgs - if not bMakeFileCalled: - return (bOk, strErrMsg) - else: - strSrc = os.path.join("bin", "lldb-launcher") - - bOk, strErrMsg = make_symlink( - vDictArgs, vstrFrameworkPythonDir, strSrc, strTarget) - - return (bOk, strErrMsg) - #++--------------------------------------------------------------------------- # Details: Make the symbolic link to the lldb-argdumper. # Args: vDictArgs - (R) Program input parameters. @@ -550,13 +517,6 @@ def create_symlinks(vDictArgs, vstrFrameworkPythonDir, vstrLldbLibDir): strLibLldbFileName, vstrLldbLibDir) - # Make symlink for darwin-debug on Darwin - strDarwinDebugFileName = "darwin-debug" - if bOk and eOSType == utilsOsType.EnumOsType.Darwin: - bOk, strErrMsg = make_symlink_darwin_debug(vDictArgs, - vstrFrameworkPythonDir, - strDarwinDebugFileName) - # Make symlink for lldb-argdumper strArgdumperFileName = "lldb-argdumper" if bOk: diff --git a/lldb/tools/darwin-debug/CMakeLists.txt b/lldb/tools/darwin-debug/CMakeLists.txt index 87e0dd53b2a2..3861017f0944 100644 --- a/lldb/tools/darwin-debug/CMakeLists.txt +++ b/lldb/tools/darwin-debug/CMakeLists.txt @@ -1,6 +1,6 @@ -add_lldb_executable(lldb-launcher INCLUDE_IN_FRAMEWORK +add_lldb_executable(darwin-debug INCLUDE_IN_FRAMEWORK darwin-debug.cpp ) -install(TARGETS lldb-launcher +install(TARGETS darwin-debug RUNTIME DESTINATION bin)