Merge pull request #2717 from DanHeidinga/djh/jsig

Support OSX dylib syntax
eclipse-openj9 · Aug 27, 2018 · a7e6182 · a7e6182
2 parents 0895044 + 9fda6c6
commit a7e6182
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/runtime/jsigWrapper/jsig.c b/runtime/jsigWrapper/jsig.c
@@ -74,7 +74,13 @@ getFunction(void **tableAddress, char *name)
 		void *handle = dlopen("libomrsig.so", RTLD_LAZY);
 		*tableAddress = dlsym(handle, name);
 #else /* defined(WIN32) */
-		void *handle = dlopen("libomrsig.so", RTLD_GLOBAL | RTLD_LAZY);
+		/* Note: this needs to be ifdef'd this way for zOS to compile as it redefines dlopen */
+		void *handle = 
+#if defined(OSX)
+			dlopen("libomrsig.dylib", RTLD_GLOBAL | RTLD_LAZY);
+#else /* OSX */
+			dlopen("libomrsig.so", RTLD_GLOBAL | RTLD_LAZY);
+#endif /*OSX */
 		*tableAddress = dlsym(handle, name);
 #endif /* defined(WIN32) */
 	}