rebase the patch

This commit is contained in:
Sylvestre Ledru 2015-09-12 18:56:19 +00:00
parent 0a66599d01
commit 0eba813af4

View File

@ -1,13 +1,13 @@
Index: llvm-toolchain-snapshot_3.8~svn246750/clang/tools/scan-build/scan-build Index: llvm-toolchain-snapshot_3.8~svn247513/clang/tools/scan-build/scan-build
=================================================================== ===================================================================
--- llvm-toolchain-snapshot_3.8~svn246750.orig/clang/tools/scan-build/scan-build --- llvm-toolchain-snapshot_3.8~svn247513.orig/clang/tools/scan-build/scan-build
+++ llvm-toolchain-snapshot_3.8~svn246750/clang/tools/scan-build/scan-build +++ llvm-toolchain-snapshot_3.8~svn247513/clang/tools/scan-build/scan-build
@@ -1642,7 +1642,7 @@ if (!@ARGV and !$RequestDisplayHelp) { @@ -1644,7 +1644,7 @@ if (!@ARGV and !$RequestDisplayHelp) {
# Find 'clang' # Find 'clang'
if (!defined $Options{AnalyzerDiscoveryMethod}) { if (!defined $Options{AnalyzerDiscoveryMethod}) {
- $Clang = Cwd::realpath("$RealBin/bin/clang"); - $Clang = Cwd::realpath("$RealBin/bin/clang") if (-f "$RealBin/bin/clang");
+ $Clang = Cwd::realpath("/usr/lib/llvm-3.8/bin/clang"); + $Clang = Cwd::realpath("/usr/lib/llvm-3.8/bin/clang") if (-f "/usr/lib/llvm-3.8/bin/clang");
if (!defined $Clang || ! -x $Clang) { if (!defined $Clang || ! -x $Clang) {
$Clang = Cwd::realpath("$RealBin/clang"); $Clang = Cwd::realpath("$RealBin/clang") if (-f "$RealBin/clang");
} }