diff options
| -rw-r--r-- | lib/Support/GraphWriter.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/lib/Support/GraphWriter.cpp b/lib/Support/GraphWriter.cpp index 1521475a8b..a7bb4f26a5 100644 --- a/lib/Support/GraphWriter.cpp +++ b/lib/Support/GraphWriter.cpp @@ -164,12 +164,14 @@ bool llvm::DisplayGraph(StringRef FilenameRef, bool wait, return ExecGraphViewer(ViewerPath, args, Filename, wait, ErrMsg); } - enum PSViewerKind { PSV_None, PSV_OSXOpen, PSV_Ghostview }; + enum PSViewerKind { PSV_None, PSV_OSXOpen, PSV_XDGOpen, PSV_Ghostview }; PSViewerKind PSViewer = PSV_None; #ifdef __APPLE__ - if (S.TryFindProgram("open", ViewerPath)) + if (!PSViewer && S.TryFindProgram("open", ViewerPath)) PSViewer = PSV_OSXOpen; #endif + if (!PSViewer && S.TryFindProgram("xdg-open", ViewerPath)) + PSViewer = PSV_XDGOpen; if (!PSViewer && S.TryFindProgram("gv", ViewerPath)) PSViewer = PSV_Ghostview; @@ -202,6 +204,10 @@ bool llvm::DisplayGraph(StringRef FilenameRef, bool wait, args.push_back("-W"); args.push_back(PSFilename.c_str()); break; + case PSV_XDGOpen: + wait = false; + args.push_back(PSFilename.c_str()); + break; case PSV_Ghostview: args.push_back("--spartan"); args.push_back(PSFilename.c_str()); |