Title: [170865] branches/safari-537.75-branch/Source
- Revision
- 170865
- Author
- lforsch...@apple.com
- Date
- 2014-07-07 17:07:54 -0700 (Mon, 07 Jul 2014)
Log Message
Merged r169927. <rdar://problem/17563093>
Modified Paths
Diff
Modified: branches/safari-537.75-branch/Source/_javascript_Core/ChangeLog (170864 => 170865)
--- branches/safari-537.75-branch/Source/_javascript_Core/ChangeLog 2014-07-07 23:44:58 UTC (rev 170864)
+++ branches/safari-537.75-branch/Source/_javascript_Core/ChangeLog 2014-07-08 00:07:54 UTC (rev 170865)
@@ -1,3 +1,18 @@
+2014-07-07 Lucas Forschler <lforsch...@apple.com>
+
+ Merge r169927
+
+ 2014-06-12 Brent Fulgham <bfulg...@apple.com>
+
+ [Win] Avoid fork bomb during build
+ https://bugs.webkit.org/show_bug.cgi?id=133837
+ <rdar://problem/17296034>
+
+ Reviewed by Tim Horton.
+
+ * _javascript_Core.vcxproj/build-generated-files.sh: Use a
+ reasonable default value when the 'num-cpus' script is not available.
+
2014-03-19 Matthew Hanson <matthew_han...@apple.com>
Merge r165902.
Modified: branches/safari-537.75-branch/Source/_javascript_Core/_javascript_Core.vcxproj/build-generated-files.sh (170864 => 170865)
--- branches/safari-537.75-branch/Source/_javascript_Core/_javascript_Core.vcxproj/build-generated-files.sh 2014-07-07 23:44:58 UTC (rev 170864)
+++ branches/safari-537.75-branch/Source/_javascript_Core/_javascript_Core.vcxproj/build-generated-files.sh 2014-07-08 00:07:54 UTC (rev 170865)
@@ -1,6 +1,11 @@
#!/usr/bin/bash
-NUMCPUS=`../../../Tools/Scripts/num-cpus`
+NUMCPUPATH="../../Tools/Scripts/num-cpus"
+if [ -x $NUMCPUPATH ]; then
+ NUMCPUS=`$NUMCPUPATH`
+else
+ NUMCPUS=8
+fi
XSRCROOT="`pwd`/.."
XSRCROOT=`realpath "$XSRCROOT"`
Modified: branches/safari-537.75-branch/Source/WebCore/ChangeLog (170864 => 170865)
--- branches/safari-537.75-branch/Source/WebCore/ChangeLog 2014-07-07 23:44:58 UTC (rev 170864)
+++ branches/safari-537.75-branch/Source/WebCore/ChangeLog 2014-07-08 00:07:54 UTC (rev 170865)
@@ -1,3 +1,18 @@
+2014-07-07 Lucas Forschler <lforsch...@apple.com>
+
+ Merge r169927
+
+ 2014-06-12 Brent Fulgham <bfulg...@apple.com>
+
+ [Win] Avoid fork bomb during build
+ https://bugs.webkit.org/show_bug.cgi?id=133837
+ <rdar://problem/17296034>
+
+ Reviewed by Tim Horton.
+
+ * WebCore.vcxproj/build-generated-files.sh: Use a reasonable
+ default value when the 'num-cpus' script is not available.
+
2014-05-19 Lucas Forschler <lforsch...@apple.com>
Merge r156116
Modified: branches/safari-537.75-branch/Source/WebCore/WebCore.vcxproj/build-generated-files.sh (170864 => 170865)
--- branches/safari-537.75-branch/Source/WebCore/WebCore.vcxproj/build-generated-files.sh 2014-07-07 23:44:58 UTC (rev 170864)
+++ branches/safari-537.75-branch/Source/WebCore/WebCore.vcxproj/build-generated-files.sh 2014-07-08 00:07:54 UTC (rev 170865)
@@ -26,7 +26,12 @@
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-NUMCPUS=`../../../Tools/Scripts/num-cpus`
+NUMCPUPATH="../../Tools/Scripts/num-cpus"
+if [ -x $NUMCPUPATH ]; then
+ NUMCPUS=`$NUMCPUPATH`
+else
+ NUMCPUS=8
+fi
XSRCROOT="`pwd`/.."
XSRCROOT=`realpath "$XSRCROOT"`
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
