From 27db8461e281ae8c64c85314ca351fe8bc61ec4a Mon Sep 17 00:00:00 2001
From: Jeff Hammond <jeff.science@gmail.com>
Date: Wed, 31 Jan 2024 13:44:36 +0200
Subject: [PATCH 1/2] use dylib suffix on MacOS

---
 libinit.c | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/libinit.c b/libinit.c
index c718713..7694482 100644
--- a/libinit.c
+++ b/libinit.c
@@ -124,15 +124,21 @@ static int MUK_Alkaa(int * argc, char *** argv, int requested, int * provided)
         }
 
         if (whose_mpi == OMPI) {
-            wrapname = "ompi-wrap.so";
+            wrapname = "ompi-wrap";
         } else if (whose_mpi == MPICH) {
-            wrapname = "mpich-wrap.so";
+            wrapname = "mpich-wrap";
         } else if (whose_mpi == INTEL) {
-            wrapname = "mpich-wrap.so";
+            wrapname = "mpich-wrap";
         } else {
             printf("MPI implementation unknown.\n");
             abort();
         }
+#if defined(__linux__)
+        const char * suffix = ".so";
+#elif defined(__APPLE__)
+        const char * suffix = ".dylib";
+#endif
+        strcat(wrapname,suffix);
     }
 
     // these are ABI-agnostic and important, so why not load them now...

From cd40eb792adac5737d87c79d98e4153bbb18c271 Mon Sep 17 00:00:00 2001
From: Jeff Hammond <jeff.science@gmail.com>
Date: Wed, 31 Jan 2024 14:13:39 +0200
Subject: [PATCH 2/2] handle dlsuffix properly

---
 libinit.c | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/libinit.c b/libinit.c
index 7694482..13167e1 100644
--- a/libinit.c
+++ b/libinit.c
@@ -9,12 +9,14 @@
 
 #if defined(__linux__)
 #define LIBMPI_NAME "libmpi.so"
+#define DLSUFFIX ".so"
 #elif defined(__APPLE__)
 #if defined(__x86_64__)
 #define LIBMPI_NAME "/usr/local/lib/libmpi.dylib"
 #else
 #define LIBMPI_NAME "/opt/homebrew/lib/libmpi.dylib"
 #endif
+#define DLSUFFIX ".dylib"
 #else
 #warning No default MPI library path.
 #endif
@@ -49,7 +51,7 @@ int * MPICH_WEIGHTS_EMPTY = NULL;
 // alkaa = start
 static int MUK_Alkaa(int * argc, char *** argv, int requested, int * provided)
 {
-    int rc;
+    int rc = 0;
 
     int verbose = 0;
     {
@@ -96,7 +98,7 @@ static int MUK_Alkaa(int * argc, char *** argv, int requested, int * provided)
         abort();
     }
 
-    char * wrapname = "/dev/null";
+    char * wrapname = NULL;
     // figure out which library i am using
     MUK_Get_library_version = MUK_DLSYM(h,"MPI_Get_library_version");
     {
@@ -124,21 +126,16 @@ static int MUK_Alkaa(int * argc, char *** argv, int requested, int * provided)
         }
 
         if (whose_mpi == OMPI) {
-            wrapname = "ompi-wrap";
+            wrapname = "ompi-wrap" DLSUFFIX;
         } else if (whose_mpi == MPICH) {
-            wrapname = "mpich-wrap";
+            wrapname = "mpich-wrap" DLSUFFIX;
         } else if (whose_mpi == INTEL) {
-            wrapname = "mpich-wrap";
+            wrapname = "mpich-wrap" DLSUFFIX;
         } else {
             printf("MPI implementation unknown.\n");
             abort();
         }
-#if defined(__linux__)
-        const char * suffix = ".so";
-#elif defined(__APPLE__)
-        const char * suffix = ".dylib";
-#endif
-        strcat(wrapname,suffix);
+        if (verbose) printf("wrapname = %s\n", wrapname);
     }
 
     // these are ABI-agnostic and important, so why not load them now...