alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity
nixpkgs/pkgs/development/tools/build-managers/bear/ignore_wrapper.patch

27 lines
1.2 KiB
Diff
Raw Normal View History

bear: fix wrapper detection patch by checking result of find_executable With the wrapper detection patch, if a build invokes an executable that cannot be found in PATH by `find_executable`, bear will fail with an `AttributeError` in `os.path.realpath`. This can happen if the build invokes some project-local tool or command, like `./build-something`. Instead of calling using the result of `find_executable` directly, first check whether the executable was found and fall back to original Bear behavior if it was not.
2019-01-09 21:00:16 +00:00
--- a/bear/main.py.in
+++ b/bear/main.py.in
@@ -49,6 +49,7 @@ import tempfile
bear: ignore wrapper calls (#20070) Fixes #20056
2016-11-03 14:27:03 +00:00
import shutil
import contextlib
import logging
+from distutils.spawn import find_executable
bear: 2.2.1 -> 2.3.11
2018-02-06 05:13:54 +00:00
# Map of ignored compiler option for the creation of a compilation database.
# This map is used in _split_command method, which classifies the parameters
bear: fix wrapper detection patch by checking result of find_executable With the wrapper detection patch, if a build invokes an executable that cannot be found in PATH by `find_executable`, bear will fail with an `AttributeError` in `os.path.realpath`. This can happen if the build invokes some project-local tool or command, like `./build-something`. Instead of calling using the result of `find_executable` directly, first check whether the executable was found and fall back to original Bear behavior if it was not.
2019-01-09 21:00:16 +00:00
@@ -569,7 +570,15 @@ class Compilation:
(compiler, language, rest of the command) otherwise """
bear: ignore wrapper calls (#20070) Fixes #20056
2016-11-03 14:27:03 +00:00
bear: 2.2.1 -> 2.3.11
2018-02-06 05:13:54 +00:00
if command: # not empty list will allow to index '0' and '1:'
- executable = os.path.basename(command[0]) # type: str
bear: fix wrapper detection patch by checking result of find_executable With the wrapper detection patch, if a build invokes an executable that cannot be found in PATH by `find_executable`, bear will fail with an `AttributeError` in `os.path.realpath`. This can happen if the build invokes some project-local tool or command, like `./build-something`. Instead of calling using the result of `find_executable` directly, first check whether the executable was found and fall back to original Bear behavior if it was not.
2019-01-09 21:00:16 +00:00
+ 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])
bear: 2.2.1 -> 2.3.11
2018-02-06 05:13:54 +00:00
parameters = command[1:] # type: List[str]
# 'wrapper' 'parameters' and
# 'wrapper' 'compiler' 'parameters' are valid.
Copy permalink