Unreviewed, fix build-webkit --ftl-jit in the case that you have your own llvm direct...

prune 'libgtest' and friends from the llvm build, since WebKit builds its own and none of the llvm
libraries depend on libgtest anyway.

* Scripts/copy-webkitlibraries-to-product-directory:

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

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index 7669f5c..3baee32 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,11 @@
+2013-08-24  Filip Pizlo  <fpizlo@apple.com>
+
+        Unreviewed, fix build-webkit --ftl-jit in the case that you have your own llvm directory. We need to
+        prune 'libgtest' and friends from the llvm build, since WebKit builds its own and none of the llvm
+        libraries depend on libgtest anyway.
+
+        * Scripts/copy-webkitlibraries-to-product-directory:
+
 2013-08-24  Darin Adler  <darin@apple.com>
 
         RetainPtr lacks move constructor for case when argument is a RetainPtr of a different type

diff --git a/Tools/Scripts/copy-webkitlibraries-to-product-directory b/Tools/Scripts/copy-webkitlibraries-to-product-directory
index ebae458..bdd3eea 100755 (executable)
--- a/Tools/Scripts/copy-webkitlibraries-to-product-directory
+++ b/Tools/Scripts/copy-webkitlibraries-to-product-directory
@@ -168,6 +168,7 @@ if ($ENV{ENABLE_FTL_JIT}) {
         opendir (my $dirHandle, $librarySourceDirectory);
         while (my $filename = readdir($dirHandle)) {
             next if $filename !~ /\.a$/;
+            next if $filename =~ /libgtest/;
             print "   Symlink $filename\n";
             my $sourceLibrary = "$librarySourceDirectory/$filename";
             my $targetLibrary = "$libraryTargetDirectory/$filename";