Revision 10047
Added by Aaron Marcuse-Kubitza over 11 years ago
| lib/sh/make.sh | ||
|---|---|---|
| 44 | 44 |
-e '/^make ([^-][^[:space:]]*)?Makefile/,/^make\[[[:digit:]]+\]: .*Makefile/d' \ |
| 45 | 45 |
-e '/^make\[[[:digit:]]+\]: .*Makefile/d' |
| 46 | 46 |
fi |
| 47 |
time cmd_log_fd=1 self $(if ! can_log; then echo '--silent '; fi)"$@"
|
|
| 47 |
time cmd_log_fd=1 self_sys $(if ! can_log; then echo '--silent ';fi)"$@"
|
|
| 48 | 48 |
) |
| 49 | 49 |
} |
| 50 | 50 |
|
Also available in: Unified diff
bugfix: lib/sh/make.sh: make(): invoke only the system make command instead of any wrapper for it in the PATH (by using self_sys instead of self), to prevent infinite recursion. single recursion is resolved by nonrecursive=1, but there are cases where mutual recursion occurs due to the presence of two, different bin/makes in the PATH (e.g. if you have two working copies with bin/make, and one is symlinked in your ~/bin/ folder), and these cases can only be resolved by clearing out the PATH completely (since the bin/makes do not know of each other's existence, in order to remove their parent dirs from the PATH).