1 files changed, 6 insertions, 4 deletions

diff --git a/tools/perf/util/config.c b/tools/perf/util/config.c
index 57ff826f150b..e18f653cd7db 100644
--- a/tools/perf/util/config.c
+++ b/tools/perf/util/config.c
@@ -522,7 +522,7 @@ static int buildid_dir_command_config(const char *var, const char *value,
         const char *v;
 
         /* same dir for all commands */
-        if (!prefixcmp(var, "buildid.") && !strcmp(var + 8, "dir")) {
+        if (!strcmp(var, "buildid.dir")) {
                 v = perf_config_dirname(var, value);
                 if (!v)
                         return -1;
@@ -539,12 +539,14 @@ static void check_buildid_dir_config(void)
         perf_config(buildid_dir_command_config, &c);
 }
 
-void set_buildid_dir(void)
+void set_buildid_dir(const char *dir)
 {
-        buildid_dir[0] = '\0';
+        if (dir)
+                scnprintf(buildid_dir, MAXPATHLEN-1, "%s", dir);
 
         /* try config file */
-        check_buildid_dir_config();
+        if (buildid_dir[0] == '\0')
+                check_buildid_dir_config();
 
         /* default to $HOME/.debug */
         if (buildid_dir[0] == '\0') {