Title: [166947] trunk
Revision
166947
Author
gga...@apple.com
Date
2014-04-08 12:48:42 -0700 (Tue, 08 Apr 2014)

Log Message

Build bmalloc on iOS too
https://bugs.webkit.org/show_bug.cgi?id=131381

Reviewed by Andreas Kling.

.: 

* Source/Makefile: Build it.

Tools: 

* Scripts/build-webkit:

Modified Paths

Diff

Modified: trunk/ChangeLog (166946 => 166947)


--- trunk/ChangeLog	2014-04-08 19:42:08 UTC (rev 166946)
+++ trunk/ChangeLog	2014-04-08 19:48:42 UTC (rev 166947)
@@ -1,3 +1,12 @@
+2014-04-08  Geoffrey Garen  <gga...@apple.com>
+
+        Build bmalloc on iOS too
+        https://bugs.webkit.org/show_bug.cgi?id=131381
+
+        Reviewed by Andreas Kling.
+
+        * Source/Makefile: Build it.
+
 2014-04-07  Geoffrey Garen  <gga...@apple.com>
 
         Build bmalloc on Mac

Modified: trunk/Source/Makefile (166946 => 166947)


--- trunk/Source/Makefile	2014-04-08 19:42:08 UTC (rev 166946)
+++ trunk/Source/Makefile	2014-04-08 19:48:42 UTC (rev 166947)
@@ -1,9 +1,9 @@
 MODULES = bmalloc WTF _javascript_Core ThirdParty/ANGLE WebCore WebInspectorUI WebKit2 WebKit
 
 ifneq (,$(findstring iphoneos,$(SDKROOT)))
-	MODULES = WTF _javascript_Core ThirdParty/ANGLE WebCore WebKit WebKit2
+	MODULES = bmalloc WTF _javascript_Core ThirdParty/ANGLE WebCore WebKit WebKit2
 else ifneq (,$(findstring iphonesimulator,$(SDKROOT)))
-	MODULES = WTF _javascript_Core ThirdParty/ANGLE WebCore WebKit WebKit2
+	MODULES = bmalloc WTF _javascript_Core ThirdParty/ANGLE WebCore WebKit WebKit2
 endif
 
 all:

Modified: trunk/Tools/ChangeLog (166946 => 166947)


--- trunk/Tools/ChangeLog	2014-04-08 19:42:08 UTC (rev 166946)
+++ trunk/Tools/ChangeLog	2014-04-08 19:48:42 UTC (rev 166947)
@@ -1,3 +1,12 @@
+2014-04-08  Geoffrey Garen  <gga...@apple.com>
+
+        Build bmalloc on iOS too
+        https://bugs.webkit.org/show_bug.cgi?id=131381
+
+        Reviewed by Andreas Kling.
+
+        * Scripts/build-webkit:
+
 2014-04-08  Brent Fulgham  <bfulg...@apple.com>
 
         Unreviewed gardening: Prevent users from attempting

Modified: trunk/Tools/Scripts/build-webkit (166946 => 166947)


--- trunk/Tools/Scripts/build-webkit	2014-04-08 19:42:08 UTC (rev 166946)
+++ trunk/Tools/Scripts/build-webkit	2014-04-08 19:48:42 UTC (rev 166947)
@@ -165,7 +165,7 @@
 # Build WTF as a separate static library on ports which support it.
 splice @projects, 0, 0, "Source/WTF" if isAppleMacWebKit() or isAppleWinWebKit() or isWinCairo();
 
-splice @projects, 0, 0, "Source/bmalloc" if isAppleMacWebKit() && !isIOSWebKit();
+splice @projects, 0, 0, "Source/bmalloc" if isAppleMacWebKit();
 
 for my $dir (@projects) {
     if (! -d $dir) {
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to