Title: [212114] trunk/Tools
Revision
212114
Author
achristen...@apple.com
Date
2017-02-10 08:50:57 -0800 (Fri, 10 Feb 2017)

Log Message

Fix El Capitan build.

* Scripts/build-webkit:
Don't build libwebrtc anywhere for now.

Modified Paths

Diff

Modified: trunk/Tools/ChangeLog (212113 => 212114)


--- trunk/Tools/ChangeLog	2017-02-10 14:32:59 UTC (rev 212113)
+++ trunk/Tools/ChangeLog	2017-02-10 16:50:57 UTC (rev 212114)
@@ -1,3 +1,10 @@
+2017-02-10  Alex Christensen  <achristen...@webkit.org>
+
+        Fix El Capitan build.
+
+        * Scripts/build-webkit:
+        Don't build libwebrtc anywhere for now.
+
 2017-02-10  Andy Estes  <aes...@apple.com>
 
         Move two MiniBrowserBundle settings out of the .pbxproj

Modified: trunk/Tools/Scripts/build-webkit (212113 => 212114)


--- trunk/Tools/Scripts/build-webkit	2017-02-10 14:32:59 UTC (rev 212113)
+++ trunk/Tools/Scripts/build-webkit	2017-02-10 16:50:57 UTC (rev 212114)
@@ -62,7 +62,6 @@
 my $coverageSupport = 0;
 my $shouldRunStaticAnalyzer = 0;
 my $startTime = time();
-my $archsi386 = 0;
 
 my @features = getFeatureOptionList();
 
@@ -73,8 +72,6 @@
 foreach (@ARGV) {
     if ($_ eq '--minimal') {
         $minimal = 1;
-    } elsif ($_ =~ /ARCHS.*i386/) {
-        $archsi386 = 1;
     }
 }
 
@@ -184,7 +181,6 @@
 
     # ANGLE and libwebrtc must come before WebCore
     splice @projects, 0, 0, ("Source/ThirdParty/ANGLE");
-    if (not architecture() eq "i386" and not $archsi386) { splice @projects, 0, 0, ("Source/ThirdParty/libwebrtc"); }
 
     push @projects, ("Source/WebKit2");
 
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to