diff options
| author | sylvestre <sylvestre@670adf90-79fe-46c2-b027-9eb1e76e7c7d> | 2014-08-06 09:43:32 +0000 |
|---|---|---|
| committer | sylvestre <sylvestre@670adf90-79fe-46c2-b027-9eb1e76e7c7d> | 2014-08-06 09:43:32 +0000 |
| commit | bdcc2345527b3a230ca624974a5e56b41ac0f0e0 (patch) | |
| tree | 5d8d82b14048f84cb21a962c96eda2037bc99eb5 | |
| parent | 7a0db9420ef9eabc8f9983b2b0529555cd49bff8 (diff) | |
| download | llvm-toolchain-3.5-bdcc2345527b3a230ca624974a5e56b41ac0f0e0.tar.gz | |
Bring back scan-build-search-path.diff (Closes: #757219)
git-svn-id: svn://svn.debian.org/svn/pkg-llvm/llvm-toolchain/branches/3.5@1320 670adf90-79fe-46c2-b027-9eb1e76e7c7d
| -rw-r--r-- | debian/changelog | 1 | ||||
| -rw-r--r-- | debian/patches/scan-build-clang-path.diff | 39 |
2 files changed, 40 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index 8f858be..e1fbfcb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ llvm-toolchain-3.5 (1:3.5~+rc1-3~exp2) UNRELEASED; urgency=medium * Enable compressed debug sections (Closes: #757002) * Force scan-build to use the same version of clang + * Bring back scan-build-search-path.diff (Closes: #757219) -- Sylvestre Ledru <sylvestre@debian.org> Mon, 04 Aug 2014 13:35:35 +0200 diff --git a/debian/patches/scan-build-clang-path.diff b/debian/patches/scan-build-clang-path.diff index 1610770..8c951e0 100644 --- a/debian/patches/scan-build-clang-path.diff +++ b/debian/patches/scan-build-clang-path.diff @@ -11,3 +11,42 @@ Index: llvm-toolchain-snapshot_3.5~svn199197/clang/tools/scan-build/scan-build if (!defined $Clang || ! -x $Clang) { $Clang = Cwd::realpath("$RealBin/clang"); } +diff -Naur llvm-toolchain-3.5-3.5~+rc1.orig/clang/tools/scan-build/ccc-analyzer llvm-toolchain-3.5-3.5~+rc1/clang/tools/scan-build/ccc-analyzer +--- llvm-toolchain-3.5-3.5~+rc1.orig/clang/tools/scan-build/ccc-analyzer 2014-08-06 10:29:51.990552103 +0200 ++++ llvm-toolchain-3.5-3.5~+rc1/clang/tools/scan-build/ccc-analyzer 2014-08-06 10:35:05.016567533 +0200 +@@ -25,6 +25,17 @@ + # Compiler command setup. + ##===----------------------------------------------------------------------===## + ++# Search in the PATH if the compiler exists ++sub SearchInPath { ++ my $file = shift; ++ foreach my $dir (split (':', $ENV{PATH})) { ++ if (-x "$dir/$file") { ++ return 1; ++ } ++ } ++ return 0; ++} ++ + my $Compiler; + my $Clang; + my $DefaultCCompiler; +@@ -41,7 +52,7 @@ + + if ($FindBin::Script =~ /c\+\+-analyzer/) { + $Compiler = $ENV{'CCC_CXX'}; +- if (!defined $Compiler || ! -x $Compiler) { $Compiler = $DefaultCXXCompiler; } ++ if (!defined $Compiler || (! -x $Compiler && ! SearchInPath($Compiler))) { $Compiler = $DefaultCXXCompiler; } + + $Clang = $ENV{'CLANG_CXX'}; + if (!defined $Clang || ! -x $Clang) { $Clang = 'clang++'; } +@@ -50,7 +61,7 @@ + } + else { + $Compiler = $ENV{'CCC_CC'}; +- if (!defined $Compiler || ! -x $Compiler) { $Compiler = $DefaultCCompiler; } ++ if (!defined $Compiler || (! -x $Compiler && ! SearchInPath($Compiler))) { $Compiler = $DefaultCCompiler; } + + $Clang = $ENV{'CLANG'}; + if (!defined $Clang || ! -x $Clang) { $Clang = 'clang'; } |