nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-25 07:05:13 +00:00
Code Issues Packages Projects Releases Wiki Activity
dc31fd042c
nixpkgs/pkgs/development/tools/analysis/clang-analyzer/0001-Fix-scan-build-to-use-NIX_CFLAGS_COMPILE.patch

36 lines
1.1 KiB
Diff
Raw Normal View History

clang-analyzer: upgrade to latest llvm release
2020-07-31 08:42:19 +00:00
From 40239d92957f1969652cdd41d6d2749c41ac4338 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Fri, 31 Jul 2020 09:22:03 +0100
Subject: [PATCH] [PATCH] Fix scan-build to use NIX_CFLAGS_COMPILE
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
clang-analyzer: respect $NIX_CFLAGS_COMPILE When using scan-build, you're often going to want to use it in the context of a Nix expression with buildInputs, and the default wrapper scripts will put things like include locations for those inputs $NIX_CFLAGS_COMPILE. Thus, scan-build also needs to pass them to the analyzer - while the link flags aren't relevant, the include flags are. This is because the analyzer executable that gets run by scan-build is *not* clang-wrapper, but the actual clang executable, so it doesn't implicitly add such arguments. The build is two-stage - it runs the real clang wrapper once, and then the analyzer once. Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-05-02 18:22:48 +00:00
clang-analyzer: upgrade to latest llvm release
2020-07-31 08:42:19 +00:00
Signed-off-by: Jörg Thalheim <joerg@thalheim.io>
clang-analyzer: respect $NIX_CFLAGS_COMPILE When using scan-build, you're often going to want to use it in the context of a Nix expression with buildInputs, and the default wrapper scripts will put things like include locations for those inputs $NIX_CFLAGS_COMPILE. Thus, scan-build also needs to pass them to the analyzer - while the link flags aren't relevant, the include flags are. This is because the analyzer executable that gets run by scan-build is *not* clang-wrapper, but the actual clang executable, so it doesn't implicitly add such arguments. The build is two-stage - it runs the real clang wrapper once, and then the analyzer once. Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-05-02 18:22:48 +00:00
---
clang-analyzer: upgrade to latest llvm release
2020-07-31 08:42:19 +00:00
tools/scan-build/libexec/ccc-analyzer | 8 ++++++++
1 file changed, 8 insertions(+)
clang-analyzer: respect $NIX_CFLAGS_COMPILE When using scan-build, you're often going to want to use it in the context of a Nix expression with buildInputs, and the default wrapper scripts will put things like include locations for those inputs $NIX_CFLAGS_COMPILE. Thus, scan-build also needs to pass them to the analyzer - while the link flags aren't relevant, the include flags are. This is because the analyzer executable that gets run by scan-build is *not* clang-wrapper, but the actual clang executable, so it doesn't implicitly add such arguments. The build is two-stage - it runs the real clang wrapper once, and then the analyzer once. Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-05-02 18:22:48 +00:00
clang-analyzer: upgrade to latest llvm release
2020-07-31 08:42:19 +00:00
diff --git a/tools/scan-build/libexec/ccc-analyzer b/tools/scan-build/libexec/ccc-analyzer
index 800f38b5..0fb50fb3 100755
--- a/tools/scan-build/libexec/ccc-analyzer
+++ b/tools/scan-build/libexec/ccc-analyzer
@@ -246,6 +246,14 @@ sub Analyze {
push @Args, "-target", $AnalyzerTarget;
clang-analyzer: respect $NIX_CFLAGS_COMPILE When using scan-build, you're often going to want to use it in the context of a Nix expression with buildInputs, and the default wrapper scripts will put things like include locations for those inputs $NIX_CFLAGS_COMPILE. Thus, scan-build also needs to pass them to the analyzer - while the link flags aren't relevant, the include flags are. This is because the analyzer executable that gets run by scan-build is *not* clang-wrapper, but the actual clang executable, so it doesn't implicitly add such arguments. The build is two-stage - it runs the real clang wrapper once, and then the analyzer once. Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-05-02 18:22:48 +00:00
}
+ # Add Nix flags to analysis
+ if (defined $ENV{'NIX_CFLAGS_COMPILE'}) {
+ my @nixArgs = split(/\s+/, $ENV{'NIX_CFLAGS_COMPILE'});
+ foreach my $nixArg (@nixArgs) {
+ push @Args, $nixArg;
+ }
+ }
+
clang-analyzer: upgrade to latest llvm release
2020-07-31 08:42:19 +00:00
my $AnalysisArgs = GetCCArgs($HtmlDir, "--analyze", \@Args);
clang-analyzer: respect $NIX_CFLAGS_COMPILE When using scan-build, you're often going to want to use it in the context of a Nix expression with buildInputs, and the default wrapper scripts will put things like include locations for those inputs $NIX_CFLAGS_COMPILE. Thus, scan-build also needs to pass them to the analyzer - while the link flags aren't relevant, the include flags are. This is because the analyzer executable that gets run by scan-build is *not* clang-wrapper, but the actual clang executable, so it doesn't implicitly add such arguments. The build is two-stage - it runs the real clang wrapper once, and then the analyzer once. Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-05-02 18:22:48 +00:00
@CmdArgs = @$AnalysisArgs;
}
--
clang-analyzer: upgrade to latest llvm release
2020-07-31 08:42:19 +00:00
2.27.0
clang-analyzer: respect $NIX_CFLAGS_COMPILE When using scan-build, you're often going to want to use it in the context of a Nix expression with buildInputs, and the default wrapper scripts will put things like include locations for those inputs $NIX_CFLAGS_COMPILE. Thus, scan-build also needs to pass them to the analyzer - while the link flags aren't relevant, the include flags are. This is because the analyzer executable that gets run by scan-build is *not* clang-wrapper, but the actual clang executable, so it doesn't implicitly add such arguments. The build is two-stage - it runs the real clang wrapper once, and then the analyzer once. Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-05-02 18:22:48 +00:00
Reference in New Issue Copy Permalink