aboutsummaryrefslogtreecommitdiff
path: root/infra/libkookie/nixpkgs/pkgs/development/tools/build-managers/bear/ignore_wrapper.patch
diff options
context:
space:
mode:
Diffstat (limited to 'infra/libkookie/nixpkgs/pkgs/development/tools/build-managers/bear/ignore_wrapper.patch')
-rw-r--r--infra/libkookie/nixpkgs/pkgs/development/tools/build-managers/bear/ignore_wrapper.patch27
1 files changed, 0 insertions, 27 deletions
diff --git a/infra/libkookie/nixpkgs/pkgs/development/tools/build-managers/bear/ignore_wrapper.patch b/infra/libkookie/nixpkgs/pkgs/development/tools/build-managers/bear/ignore_wrapper.patch
deleted file mode 100644
index 8effc723bbab..000000000000
--- a/infra/libkookie/nixpkgs/pkgs/development/tools/build-managers/bear/ignore_wrapper.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- a/bear/main.py.in
-+++ b/bear/main.py.in
-@@ -49,6 +49,7 @@ import tempfile
- import shutil
- import contextlib
- import logging
-+from distutils.spawn import find_executable
-
- # Map of ignored compiler option for the creation of a compilation database.
- # This map is used in _split_command method, which classifies the parameters
-@@ -569,7 +570,15 @@ class Compilation:
- (compiler, language, rest of the command) otherwise """
-
- if command: # not empty list will allow to index '0' and '1:'
-- executable = os.path.basename(command[0]) # type: str
-+ executable_file = find_executable(command[0])
-+ if executable_file:
-+ absolute_executable = os.path.realpath(executable_file)
-+ # Ignore Nix wrappers.
-+ if 'wrapper' in absolute_executable:
-+ return None
-+ executable = os.path.basename(absolute_executable)
-+ else:
-+ executable = os.path.basename(command[0])
- parameters = command[1:] # type: List[str]
- # 'wrapper' 'parameters' and
- # 'wrapper' 'compiler' 'parameters' are valid. \ No newline at end of file