diff options
| author | Andrey Konovalov <andrey.konovalov@linaro.org> | 2013-03-22 15:06:02 +0400 |
|---|---|---|
| committer | Andrey Konovalov <andrey.konovalov@linaro.org> | 2013-03-22 15:06:02 +0400 |
| commit | 0f66281a18ce706b4de2d4c208a852d358ecaf43 (patch) | |
| tree | d9de933bb569d32af0f4fda222249546a7efb19d | |
| parent | 754a7237dd0d054a18a8d0e5a6c6fa99fe86bb09 (diff) | |
| parent | 4f0d8f643e214288b37b16332275e8bc1463ad8c (diff) | |
Automatically merging tracking-ll-v3.9-misc-fixes into merge-linux-linaroll-20130322.0ll_20130322.0
Conflicting files:
scripts/mod/Makefile
| -rw-r--r-- | tools/perf/config/utilities.mak | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/perf/config/utilities.mak b/tools/perf/config/utilities.mak index 8ef3bd30a549..3e897198d1f7 100644 --- a/tools/perf/config/utilities.mak +++ b/tools/perf/config/utilities.mak @@ -173,7 +173,7 @@ _ge-abspath = $(if $(is-executable),$(1)) # Usage: absolute-executable-path-or-empty = $(call get-executable-or-default,variable,default) # define get-executable-or-default -$(if $($(1)),$(call _ge_attempt,$($(1)),$(1)),$(call _ge_attempt,$(2),$(1))) +$(if $($(1)),$(call _ge_attempt,$($(1)),$(1)),$(call _ge_attempt,$(2))) endef _ge_attempt = $(if $(get-executable),$(get-executable),$(_gea_warn)$(call _gea_err,$(2))) _gea_warn = $(warning The path '$(1)' is not executable.) |