From 1f81889d1b78259be3ee8c3f2ba888348963ae44 Mon Sep 17 00:00:00 2001
From: jackun <jack.un@gmail.com>
Date: Fri, 5 Jun 2020 15:27:47 +0300
Subject: [PATCH] Show bitness in library loaders

---
 src/loaders/loader_dbus.cpp   | 2 +-
 src/loaders/loader_glx.cpp    | 2 +-
 src/loaders/loader_nvctrl.cpp | 2 +-
 src/loaders/loader_nvml.cpp   | 5 ++++-
 src/loaders/loader_x11.cpp    | 2 +-
 5 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/loaders/loader_dbus.cpp b/src/loaders/loader_dbus.cpp
index ca6d961..af0a38a 100644
--- a/src/loaders/loader_dbus.cpp
+++ b/src/loaders/loader_dbus.cpp
@@ -26,7 +26,7 @@ bool libdbus_loader::Load(const std::string& library_name) {
 #if defined(LIBRARY_LOADER_DBUS_H_DLOPEN)
   library_ = dlopen(library_name.c_str(), RTLD_LAZY);
   if (!library_) {
-    std::cerr << "MANGOHUD: " << library_name << " dlopen failed: " << dlerror() << std::endl;
+    std::cerr << "MANGOHUD: Failed to open " << "" MANGOHUD_ARCH << " " << library_name << ": " << dlerror() << std::endl;
     return false;
   }
 
diff --git a/src/loaders/loader_glx.cpp b/src/loaders/loader_glx.cpp
index f82b101..ca22ccd 100644
--- a/src/loaders/loader_glx.cpp
+++ b/src/loaders/loader_glx.cpp
@@ -17,7 +17,7 @@ bool glx_loader::Load() {
   // Force load libGL
   void *handle = real_dlopen("libGL.so.1", RTLD_LAZY);
   if (!handle) {
-    std::cerr << "MANGOHUD: couldn't find libGL.so.1: " << dlerror() << std::endl;
+    std::cerr << "MANGOHUD: Failed to open " << "" MANGOHUD_ARCH << " libGL.so.1: " << dlerror() << std::endl;
     return false;
   }
 
diff --git a/src/loaders/loader_nvctrl.cpp b/src/loaders/loader_nvctrl.cpp
index 0d00d11..e5fca7c 100644
--- a/src/loaders/loader_nvctrl.cpp
+++ b/src/loaders/loader_nvctrl.cpp
@@ -25,7 +25,7 @@ bool libnvctrl_loader::Load(const std::string& library_name) {
 #if defined(LIBRARY_LOADER_NVCTRL_H_DLOPEN)
   library_ = dlopen(library_name.c_str(), RTLD_LAZY);
   if (!library_) {
-    std::cerr << "MANGOHUD: " << library_name << " dlopen failed: " << dlerror() << std::endl;
+    std::cerr << "MANGOHUD: Failed to open " << "" MANGOHUD_ARCH << " " << library_name << ": " << dlerror() << std::endl;
     return false;
   }
 
diff --git a/src/loaders/loader_nvml.cpp b/src/loaders/loader_nvml.cpp
index 7e7cf61..d09fe54 100644
--- a/src/loaders/loader_nvml.cpp
+++ b/src/loaders/loader_nvml.cpp
@@ -2,6 +2,7 @@
 // Path to the code generator: /home/crz/git/MangoHud/generate_library_loader.py .
 
 #include "loader_nvml.h"
+#include <iostream>
 
 // Put these sanity checks here so that they fire at most once
 // (to avoid cluttering the build output).
@@ -26,8 +27,10 @@ bool libnvml_loader::Load(const std::string& library_name) {
 
 #if defined(LIBRARY_LOADER_NVML_H_DLOPEN)
   library_ = dlopen(library_name.c_str(), RTLD_LAZY);
-  if (!library_)
+  if (!library_) {
+    std::cerr << "MANGOHUD: Failed to open " << "" MANGOHUD_ARCH << " " << library_name << ": " << dlerror() << std::endl;
     return false;
+  }
 #endif
 
 
diff --git a/src/loaders/loader_x11.cpp b/src/loaders/loader_x11.cpp
index 0663ae5..25c65bf 100644
--- a/src/loaders/loader_x11.cpp
+++ b/src/loaders/loader_x11.cpp
@@ -15,7 +15,7 @@ bool libx11_loader::Load(const std::string& library_name) {
 
   library_ = dlopen(library_name.c_str(), RTLD_LAZY);
   if (!library_) {
-    std::cerr << "MANGOHUD: " << library_name << " dlopen failed: " << dlerror() << std::endl;
+    std::cerr << "MANGOHUD: Failed to open " << "" MANGOHUD_ARCH << " " << library_name << ": " << dlerror() << std::endl;
     return false;
   }