Title: [212099] trunk/Tools
- Revision
- 212099
- Author
- achristen...@apple.com
- Date
- 2017-02-10 00:41:56 -0800 (Fri, 10 Feb 2017)
Log Message
Fix 32-bit build on El Capitan.
* Scripts/build-webkit:
The bot uses ARCHS=i386 instead of --32-bit.
This is a hack, but it should fix the bot until I can do a better fix in the morning.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (212098 => 212099)
--- trunk/Tools/ChangeLog 2017-02-10 08:33:19 UTC (rev 212098)
+++ trunk/Tools/ChangeLog 2017-02-10 08:41:56 UTC (rev 212099)
@@ -3,6 +3,14 @@
Fix 32-bit build on El Capitan.
* Scripts/build-webkit:
+ The bot uses ARCHS=i386 instead of --32-bit.
+ This is a hack, but it should fix the bot until I can do a better fix in the morning.
+
+2017-02-10 Alex Christensen <achristen...@webkit.org>
+
+ Fix 32-bit build on El Capitan.
+
+ * Scripts/build-webkit:
Don't build i386 libwebrtc.
2017-02-09 Alex Christensen <achristen...@webkit.org>
Modified: trunk/Tools/Scripts/build-webkit (212098 => 212099)
--- trunk/Tools/Scripts/build-webkit 2017-02-10 08:33:19 UTC (rev 212098)
+++ trunk/Tools/Scripts/build-webkit 2017-02-10 08:41:56 UTC (rev 212099)
@@ -62,6 +62,7 @@
my $coverageSupport = 0;
my $shouldRunStaticAnalyzer = 0;
my $startTime = time();
+my $archsi386 = 0;
my @features = getFeatureOptionList();
@@ -72,6 +73,8 @@
foreach (@ARGV) {
if ($_ eq '--minimal') {
$minimal = 1;
+ } elsif ($_ eq 'ARCHS=i386') {
+ $archsi386 = 1;
}
}
@@ -181,7 +184,7 @@
# ANGLE and libwebrtc must come before WebCore
splice @projects, 0, 0, ("Source/ThirdParty/ANGLE");
- if (not architecture() eq "i386") { splice @projects, 0, 0, ("Source/ThirdParty/libwebrtc"); }
+ 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
