From e06b834dfaaba2b34cf7ad0cf4851923f5df7151 Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Mon, 29 Jul 2024 11:59:41 -0400 Subject: [PATCH] loader: Stop looking in ${libdir}/tls/ MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We don't install there, haven't in a long time. Reviewed-by: Marek Olšák Part-of: --- src/loader/loader.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/src/loader/loader.c b/src/loader/loader.c index 28d17ac5e37..98bd9121220 100644 --- a/src/loader/loader.c +++ b/src/loader/loader.c @@ -856,18 +856,13 @@ loader_open_driver_lib(const char *driver_name, next = end; len = next - p; - snprintf(path, sizeof(path), "%.*s/tls/%s%s.so", len, + snprintf(path, sizeof(path), "%.*s/%s%s.so", len, p, driver_name, lib_suffix); driver = dlopen(path, RTLD_NOW | RTLD_GLOBAL); if (driver == NULL) { - snprintf(path, sizeof(path), "%.*s/%s%s.so", len, - p, driver_name, lib_suffix); - driver = dlopen(path, RTLD_NOW | RTLD_GLOBAL); - if (driver == NULL) { - dl_error = dlerror(); - log_(_LOADER_DEBUG, "MESA-LOADER: failed to open %s: %s\n", - path, dl_error); - } + dl_error = dlerror(); + log_(_LOADER_DEBUG, "MESA-LOADER: failed to open %s: %s\n", + path, dl_error); } /* not need continue to loop all paths once the driver is found */ if (driver != NULL)