Changeset 259755 in webkit

Timestamp:

Apr 8, 2020, 2:06:36 PM (6 years ago)

Author:

stephan.szabo@sony.com

Message:

[PlayStation] Update import of libdl stubs for new Angle dladdr use
​https://bugs.webkit.org/show_bug.cgi?id=210200

Reviewed by Don Olmstead.

• Source/cmake/OptionsPlayStation.cmake:

Use find_package to get libdl wrappers on playstation, include
them in both executables and shared libraries.

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• Source/cmake/OptionsPlayStation.cmake (modified) (1 diff)

trunk/ChangeLog

@@ +1 @@
+2020-04-08  Stephan Szabo  <stephan.szabo@sony.com>
+
+        [PlayStation] Update import of libdl stubs for new Angle dladdr use
+        https://bugs.webkit.org/show_bug.cgi?id=210200
+
+        Reviewed by Don Olmstead.
+
+        * Source/cmake/OptionsPlayStation.cmake:
+        Use find_package to get libdl wrappers on playstation, include
+        them in both executables and shared libraries.
+
 2020-04-08  Truitt Savell  <tsavell@apple.com>
 

trunk/Source/cmake/OptionsPlayStation.cmake

@@ -189 +189 @@
 endif ()
 
-find_library(DL_LIBRARY NAMES dl PATHS ${WEBKIT_LIBRARIES_DIR}/lib)
-if (DL_LIBRARY)
-    add_link_options("$<$<STREQUAL:$<TARGET_PROPERTY:TYPE>,EXECUTABLE>:${DL_LIBRARY}>")
-    add_link_options("$<$<STREQUAL:$<TARGET_PROPERTY:TYPE>,EXECUTABLE>:-Wl,--wrap=dlopen>")
-    add_link_options("$<$<STREQUAL:$<TARGET_PROPERTY:TYPE>,EXECUTABLE>:-Wl,--wrap=dlclose>")
-    add_link_options("$<$<STREQUAL:$<TARGET_PROPERTY:TYPE>,EXECUTABLE>:-Wl,--wrap=dlerror>")
-    add_link_options("$<$<STREQUAL:$<TARGET_PROPERTY:TYPE>,EXECUTABLE>:-Wl,--wrap=dlsym>")
+find_package(libdl)
+if (TARGET libdl::dl)
+    add_link_options("$<$<OR:$<STREQUAL:$<TARGET_PROPERTY:TYPE>,EXECUTABLE>,$<STREQUAL:$<TARGET_PROPERTY:TYPE>,SHARED_LIBRARY>>:$<TARGET_PROPERTY:libdl::dl,IMPORTED_LOCATION_RELEASE>>")
+    add_link_options("$<$<OR:$<STREQUAL:$<TARGET_PROPERTY:TYPE>,EXECUTABLE>,$<STREQUAL:$<TARGET_PROPERTY:TYPE>,SHARED_LIBRARY>>:$<TARGET_PROPERTY:libdl::dl,INTERFACE_LINK_OPTIONS>>")
 endif ()