Author: Raphael Isemann Date: 2019-12-04T14:37:10+01:00 New Revision: 5e713563934eadb48b4830ad019bdb91f1d89150
URL: https://github.com/llvm/llvm-project/commit/5e713563934eadb48b4830ad019bdb91f1d89150 DIFF: https://github.com/llvm/llvm-project/commit/5e713563934eadb48b4830ad019bdb91f1d89150.diff LOG: [lldb] Fix macOS build by replacing nullptr with FileSpec() Before we had a implicit conversion from nullptr to FileSpec which was thankfully removed. Added: Modified: lldb/source/Host/macosx/objcxx/Host.mm lldb/source/Symbol/LocateSymbolFileMacOSX.cpp Removed: ################################################################################ diff --git a/lldb/source/Host/macosx/objcxx/Host.mm b/lldb/source/Host/macosx/objcxx/Host.mm index 8c7393739bc6..03880ff433bd 100644 --- a/lldb/source/Host/macosx/objcxx/Host.mm +++ b/lldb/source/Host/macosx/objcxx/Host.mm @@ -1130,7 +1130,7 @@ static Status LaunchProcessPosixSpawn(const char *exe_path, // --arch <ARCH> as part of the shell invocation // to do that job on OSX. - if (launch_info.GetShell() == nullptr) { + if (launch_info.GetShell() == FileSpec()) { // We don't need to do this for ARM, and we really shouldn't now that we // have multiple CPU subtypes and no posix_spawnattr call that allows us // to set which CPU subtype to launch... diff --git a/lldb/source/Symbol/LocateSymbolFileMacOSX.cpp b/lldb/source/Symbol/LocateSymbolFileMacOSX.cpp index 74718a8c5e30..5ee632ec2077 100644 --- a/lldb/source/Symbol/LocateSymbolFileMacOSX.cpp +++ b/lldb/source/Symbol/LocateSymbolFileMacOSX.cpp @@ -595,7 +595,7 @@ bool Symbols::DownloadObjectAndSymbolFile(ModuleSpec &module_spec, } Status error = Host::RunShellCommand( command.GetData(), - NULL, // current working directory + FileSpec(), // current working directory &exit_status, // Exit status &signo, // Signal int * &command_output, // Command output _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
