casa-mp-base

From 1f5179f2a269cf8e6c3ec4a9fb0e360dd1e30954 Mon Sep 17 00:00:00 2001

From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>

Date: Sat, 17 Jan 2015 17:55:27 -0800

Subject: [PATCH 1002/1008] MacPorts Only: Fix name of scan-view executable

 inside scan-build

​

http://trac.macports.org/ticket/35006

​

Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>

---

 tools/scan-build/bin/scan-build | 2 ++

 1 file changed, 2 insertions(+)

​

diff --git llvm_master/tools/clang/tools/scan-build/bin/scan-build macports_master/tools/clang/tools/scan-build/bin/scan-build

index cbf3bf3d6f..f7fad16bba 100755

--- llvm_master/tools/clang/tools/scan-build/bin/scan-build

+++ macports_master/tools/clang/tools/scan-build/bin/scan-build

@@ -1855,6 +1855,8 @@ if (defined $Options{OutputFormat}) {

       Diag "Analysis run complete.\n";

       Diag "Viewing analysis results in '$Options{OutputDir}' using scan-view.\n";

       my $ScanView = Cwd::realpath("$RealBin/scan-view");

+      if (! -x $ScanView) { $ScanView = Cwd::realpath("$RealBin/bin/scan-view"); }

+      if (! -x $ScanView) { $ScanView = Cwd::realpath("$RealBin/../scan-view/scan-view"); }

       if (! -x $ScanView) { $ScanView = "scan-view"; }

       if (! -x $ScanView) { $ScanView = Cwd::realpath("$RealBin/../../scan-view/bin/scan-view"); }

       exec $ScanView, "$Options{OutputDir}";

-- 

2.13.3

​