Fix 32-bit build on El Capitan.
authorachristensen@apple.com <achristensen@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 10 Feb 2017 08:12:42 +0000 (08:12 +0000)
committerachristensen@apple.com <achristensen@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 10 Feb 2017 08:12:42 +0000 (08:12 +0000)
* Scripts/build-webkit:
Don't build i386 libwebrtc.

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

Tools/ChangeLog
Tools/Scripts/build-webkit

index 20354c8..9166f95 100644 (file)
@@ -1,3 +1,10 @@
+2017-02-10  Alex Christensen  <achristensen@webkit.org>
+
+        Fix 32-bit build on El Capitan.
+
+        * Scripts/build-webkit:
+        Don't build i386 libwebrtc.
+
 2017-02-09  Alex Christensen  <achristensen@webkit.org>
 
         Unreviewed, rolling out r212040.
index 0e416e8..e5840e8 100755 (executable)
@@ -180,7 +180,8 @@ if (isAppleCocoaWebKit()) {
     }
 
     # ANGLE and libwebrtc must come before WebCore
-    splice @projects, 0, 0, ("Source/ThirdParty/ANGLE", "Source/ThirdParty/libwebrtc");
+    splice @projects, 0, 0, ("Source/ThirdParty/ANGLE");
+    if (not architecture() eq "i386") { splice @projects, 0, 0, ("Source/ThirdParty/libwebrtc"); }
 
     push @projects, ("Source/WebKit2");