[Mac][GTK] Fix JSC FTL build
authorphiln@webkit.org <philn@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 8 Dec 2015 11:18:12 +0000 (11:18 +0000)
committerphiln@webkit.org <philn@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 8 Dec 2015 11:18:12 +0000 (11:18 +0000)
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.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@193747 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/JavaScriptCore/CMakeLists.txt
Source/JavaScriptCore/ChangeLog

index c863276..06d1422 100644 (file)
@@ -990,7 +990,10 @@ if (ENABLE_FTL_JIT)
 
     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=${JAVASCRIPTCORE_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=${JAVASCRIPTCORE_DIR}/llvm/library/libllvmForJSC.version")
+    endif ()
 
     # Added extra items for JavaScriptCore
     list(APPEND JavaScriptCore_SYSTEM_INCLUDE_DIRECTORIES
index 974797d..4d1284e 100644 (file)
@@ -1,3 +1,13 @@
+2015-12-08  Philippe Normand  <pnormand@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  <berto@igalia.com>
 
         Unreviewed. Use pageSize() instead of getpagesize() after r193648