diff options
Diffstat (limited to 'tools/perf/util/exec_cmd.c')
| -rw-r--r-- | tools/perf/util/exec_cmd.c | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/tools/perf/util/exec_cmd.c b/tools/perf/util/exec_cmd.c index 67eeff57156..7adf4ad15d8 100644 --- a/tools/perf/util/exec_cmd.c +++ b/tools/perf/util/exec_cmd.c | |||
| @@ -11,31 +11,12 @@ static const char *argv0_path; | |||
| 11 | 11 | ||
| 12 | const char *system_path(const char *path) | 12 | const char *system_path(const char *path) |
| 13 | { | 13 | { |
| 14 | #ifdef RUNTIME_PREFIX | ||
| 15 | static const char *prefix; | ||
| 16 | #else | ||
| 17 | static const char *prefix = PREFIX; | 14 | static const char *prefix = PREFIX; |
| 18 | #endif | ||
| 19 | struct strbuf d = STRBUF_INIT; | 15 | struct strbuf d = STRBUF_INIT; |
| 20 | 16 | ||
| 21 | if (is_absolute_path(path)) | 17 | if (is_absolute_path(path)) |
| 22 | return path; | 18 | return path; |
| 23 | 19 | ||
| 24 | #ifdef RUNTIME_PREFIX | ||
| 25 | assert(argv0_path); | ||
| 26 | assert(is_absolute_path(argv0_path)); | ||
| 27 | |||
| 28 | if (!prefix && | ||
| 29 | !(prefix = strip_path_suffix(argv0_path, PERF_EXEC_PATH)) && | ||
| 30 | !(prefix = strip_path_suffix(argv0_path, BINDIR)) && | ||
| 31 | !(prefix = strip_path_suffix(argv0_path, "perf"))) { | ||
| 32 | prefix = PREFIX; | ||
| 33 | fprintf(stderr, "RUNTIME_PREFIX requested, " | ||
| 34 | "but prefix computation failed. " | ||
| 35 | "Using static fallback '%s'.\n", prefix); | ||
| 36 | } | ||
| 37 | #endif | ||
| 38 | |||
| 39 | strbuf_addf(&d, "%s/%s", prefix, path); | 20 | strbuf_addf(&d, "%s/%s", prefix, path); |
| 40 | path = strbuf_detach(&d, NULL); | 21 | path = strbuf_detach(&d, NULL); |
| 41 | return path; | 22 | return path; |
