diff options
| -rw-r--r-- | tools/perf/config/utilities.mak | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/perf/config/utilities.mak b/tools/perf/config/utilities.mak index e5413125e6bb..8ef3bd30a549 100644 --- a/tools/perf/config/utilities.mak +++ b/tools/perf/config/utilities.mak | |||
| @@ -13,7 +13,7 @@ newline := $(newline) | |||
| 13 | # what should replace a newline when escaping | 13 | # what should replace a newline when escaping |
| 14 | # newlines; the default is a bizarre string. | 14 | # newlines; the default is a bizarre string. |
| 15 | # | 15 | # |
| 16 | nl-escape = $(or $(1),m822df3020w6a44id34bt574ctac44eb9f4n) | 16 | nl-escape = $(if $(1),$(1),m822df3020w6a44id34bt574ctac44eb9f4n) |
| 17 | 17 | ||
| 18 | # escape-nl | 18 | # escape-nl |
| 19 | # | 19 | # |
| @@ -173,9 +173,9 @@ _ge-abspath = $(if $(is-executable),$(1)) | |||
| 173 | # Usage: absolute-executable-path-or-empty = $(call get-executable-or-default,variable,default) | 173 | # Usage: absolute-executable-path-or-empty = $(call get-executable-or-default,variable,default) |
| 174 | # | 174 | # |
| 175 | define get-executable-or-default | 175 | define get-executable-or-default |
| 176 | $(if $($(1)),$(call _ge_attempt,$($(1)),$(1)),$(call _ge_attempt,$(2))) | 176 | $(if $($(1)),$(call _ge_attempt,$($(1)),$(1)),$(call _ge_attempt,$(2),$(1))) |
| 177 | endef | 177 | endef |
| 178 | _ge_attempt = $(or $(get-executable),$(_gea_warn),$(call _gea_err,$(2))) | 178 | _ge_attempt = $(if $(get-executable),$(get-executable),$(_gea_warn)$(call _gea_err,$(2))) |
| 179 | _gea_warn = $(warning The path '$(1)' is not executable.) | 179 | _gea_warn = $(warning The path '$(1)' is not executable.) |
| 180 | _gea_err = $(if $(1),$(error Please set '$(1)' appropriately)) | 180 | _gea_err = $(if $(1),$(error Please set '$(1)' appropriately)) |
| 181 | 181 | ||