Rename libraries on Mac OS to prevent conflicts.

src/OpenGL/libEGL/BUILD.gn

@@ -41,8 +41,10 @@ config("swiftshader_libEGL_private_config") {
 }
 
 shared_library("swiftshader_libEGL") {
-  output_name = "libEGL"
-  output_dir = "$root_out_dir/swiftshader"
+  if (!is_mac) {
+    output_name = "libEGL"
+    output_dir = "$root_out_dir/swiftshader"
+  }
 
   deps = [
     "//build/config:exe_and_shlib_deps",
@@ -70,7 +72,7 @@ shared_library("swiftshader_libEGL") {
       "Quartz.framework",
       "Cocoa.framework",
     ]
-    ldflags = [ "-Wl,-install_name,@loader_path/swiftshader/libEGL.dylib" ]
+    ldflags = [ "-Wl,-install_name,@rpath/libswiftshader_libEGL.dylib" ]
   } else if (is_win) {
     configs -= [ "//build/config/win:unicode" ]
     ldflags = [ "/DEF:" + rebase_path("libGLESv2.def", root_build_dir) ]

src/OpenGL/libEGL/libEGL.hpp

@@ -114,9 +114,9 @@ private:
 				#endif
 			#elif defined(__APPLE__)
 				#if defined(__LP64__)
-					const char *libEGL_lib[] = {"lib64EGL_translator.dylib", "libEGL.so", "libEGL.dylib"};
+					const char *libEGL_lib[] = {"lib64EGL_translator.dylib", "libEGL.so", "libEGL.dylib", "libswiftshader_libEGL.dylib"};
 				#else
-					const char *libEGL_lib[] = {"libEGL_translator.dylib", "libEGL.so", "libEGL.dylib"};
+					const char *libEGL_lib[] = {"libEGL_translator.dylib", "libEGL.so", "libEGL.dylib", "libswiftshader_libEGL.dylib"};
 				#endif
 			#else
 				#error "libEGL::loadExports unimplemented for this platform"

src/OpenGL/libGLESv2/BUILD.gn

@@ -53,8 +53,10 @@ config("swiftshader_libGLESv2_private_config") {
 }
 
 shared_library("swiftshader_libGLESv2") {
-  output_name = "libGLESv2"
-  output_dir = "$root_out_dir/swiftshader"
+  if (!is_mac) {
+    output_name = "libGLESv2"
+    output_dir = "$root_out_dir/swiftshader"
+  }
 
   deps = [
     "../../OpenGL/compiler:swiftshader_opengl_compiler",
@@ -92,7 +94,7 @@ shared_library("swiftshader_libGLESv2") {
     configs -= [ "//build/config/win:unicode" ]
     ldflags = [ "/DEF:" + rebase_path("libGLESv2.def", root_build_dir) ]
   } else if (is_mac) {
-    ldflags = [ "-Wl,-install_name,@loader_path/swiftshader/libGLESv2.dylib" ]
+    ldflags = [ "-Wl,-install_name,@rpath/libswiftshader_libGLESv2.dylib" ]
   } else if (is_linux) {
     ldflags =
         [ "-Wl,--version-script=" + rebase_path("exports.map", root_build_dir) ]

src/OpenGL/libGLESv2/libGLESv2.hpp

@@ -298,9 +298,9 @@ private:
 				#endif
 			#elif defined(__APPLE__)
 				#if defined(__LP64__)
-					const char *libGLESv2_lib[] = {"lib64GLES_V2_translator.dylib", "libGLESv2.dylib"};
+					const char *libGLESv2_lib[] = {"lib64GLES_V2_translator.dylib", "libGLESv2.dylib", "libswiftshader_libGLESv2.dylib"};
 				#else
-					const char *libGLESv2_lib[] = {"libGLES_V2_translator.dylib", "libGLESv2.dylib"};
+					const char *libGLESv2_lib[] = {"libGLES_V2_translator.dylib", "libGLESv2.dylib", "libswiftshader_libGLESv2.dylib"};
 				#endif
 			#else
 				#error "libGLESv2::loadExports unimplemented for this platform"

tests/unittests/BUILD.gn

@@ -44,7 +44,7 @@ test("swiftshader_unittests") {
   } else if (is_mac) {
     ldflags = [
       "-rpath",
-      "@executable_path/swiftshader/",
+      "@executable_path/",
     ]
   } else {
     ldflags = [ "-Wl,-rpath=\$ORIGIN/swiftshader" ]