Title: [193747] trunk/Source/_javascript_Core
- Revision
- 193747
- Author
- ph...@webkit.org
- Date
- 2015-12-08 03:18:12 -0800 (Tue, 08 Dec 2015)
Log Message
[Mac][GTK] Fix JSC FTL build
https://bugs.webkit.org/show_bug.cgi?id=151915
Reviewed by Csaba Osztrogonác.
* CMakeLists.txt: Don't pass version-script option to ld on Darwin because this platform's linker
doesn't support this option.
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/CMakeLists.txt (193746 => 193747)
--- trunk/Source/_javascript_Core/CMakeLists.txt 2015-12-08 11:07:11 UTC (rev 193746)
+++ trunk/Source/_javascript_Core/CMakeLists.txt 2015-12-08 11:18:12 UTC (rev 193747)
@@ -990,7 +990,10 @@
WEBKIT_WRAP_SOURCELIST(${llvmForJSC_SOURCES})
add_library(llvmForJSC SHARED ${llvmForJSC_SOURCES} ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/WebKitLLVMLibraryToken.h)
- target_link_libraries(llvmForJSC ${LLVM_STATIC_LIBRARIES} ${LLVM_SYSTEM_LIBRARIES} -Wl,--version-script=${_javascript_CORE_DIR}/llvm/library/libllvmForJSC.version)
+ target_link_libraries(llvmForJSC ${LLVM_STATIC_LIBRARIES} ${LLVM_SYSTEM_LIBRARIES})
+ if (NOT CMAKE_SYSTEM_NAME MATCHES "Darwin")
+ ADD_TARGET_PROPERTIES(llvmForJSC LINK_FLAGS "-Wl,--version-script=${_javascript_CORE_DIR}/llvm/library/libllvmForJSC.version")
+ endif ()
# Added extra items for _javascript_Core
list(APPEND _javascript_Core_SYSTEM_INCLUDE_DIRECTORIES
Modified: trunk/Source/_javascript_Core/ChangeLog (193746 => 193747)
--- trunk/Source/_javascript_Core/ChangeLog 2015-12-08 11:07:11 UTC (rev 193746)
+++ trunk/Source/_javascript_Core/ChangeLog 2015-12-08 11:18:12 UTC (rev 193747)
@@ -1,3 +1,13 @@
+2015-12-08 Philippe Normand <pnorm...@igalia.com>
+
+ [Mac][GTK] Fix JSC FTL build
+ https://bugs.webkit.org/show_bug.cgi?id=151915
+
+ Reviewed by Csaba Osztrogonác.
+
+ * CMakeLists.txt: Don't pass version-script option to ld on Darwin because this platform's linker
+ doesn't support this option.
+
2015-12-08 Alberto Garcia <be...@igalia.com>
Unreviewed. Use pageSize() instead of getpagesize() after r193648
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
