Error running copy-webkitlibraries-to-product-directory

<http://webkit.org/b/133449>
<rdar://problem/17047638>

Reviewed by Filip Pizlo.

* Makefile: Ignore the mysterious future.  Use "@true" to
suppress the annoying "Nothing to be done for `libs'." message.

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

diff --git a/WebKitLibraries/ChangeLog b/WebKitLibraries/ChangeLog
index 6624842e3be92bf67395913bd736e7f4963258a2..e76ff8d3b35b41adb8e308aa1052c348a57c9715 100644 (file)
--- a/WebKitLibraries/ChangeLog
+++ b/WebKitLibraries/ChangeLog
@@ -1,3 +1,14 @@
+2014-06-02  David Kilzer  <ddkilzer@apple.com>
+
+        Error running copy-webkitlibraries-to-product-directory
+        <http://webkit.org/b/133449>
+        <rdar://problem/17047638>
+
+        Reviewed by Filip Pizlo.
+
+        * Makefile: Ignore the mysterious future.  Use "@true" to
+        suppress the annoying "Nothing to be done for `libs'." message.
+
 2014-05-27  Tibor Meszaros  <tmeszaros.u-szeged@partner.samsung.com>
 
         Remove BLOB guards

diff --git a/WebKitLibraries/Makefile b/WebKitLibraries/Makefile
index a85e03d25bb7fac83a6422da4ae92747f21a5b10..e4df37480d9861988ec47df3f6d39455b37048d1 100644 (file)
--- a/WebKitLibraries/Makefile
+++ b/WebKitLibraries/Makefile
@@ -1,7 +1,12 @@
 SCRIPTS_PATH = ../Tools/Scripts
 
+ifeq ($(shell sw_vers -productVersion | cut -d. -f-2), 10.10)
+libs:
+       @true
+else
 libs:
        perl $(SCRIPTS_PATH)/copy-webkitlibraries-to-product-directory --wksi --llvm
+endif
 
 all: libs