Title: [259755] trunk
- Revision
- 259755
- Author
- stephan.sz...@sony.com
- Date
- 2020-04-08 14:06:36 -0700 (Wed, 08 Apr 2020)
Log 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.
Modified Paths
Diff
Modified: trunk/ChangeLog (259754 => 259755)
--- trunk/ChangeLog 2020-04-08 20:54:14 UTC (rev 259754)
+++ trunk/ChangeLog 2020-04-08 21:06:36 UTC (rev 259755)
@@ -1,3 +1,14 @@
+2020-04-08 Stephan Szabo <stephan.sz...@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 <tsav...@apple.com>
Unreviewed, reverting r259708.
Modified: trunk/Source/cmake/OptionsPlayStation.cmake (259754 => 259755)
--- trunk/Source/cmake/OptionsPlayStation.cmake 2020-04-08 20:54:14 UTC (rev 259754)
+++ trunk/Source/cmake/OptionsPlayStation.cmake 2020-04-08 21:06:36 UTC (rev 259755)
@@ -188,13 +188,10 @@
add_definitions(/MP)
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 ()
function(add_library target type)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
