Title: [200174] releases/WebKitGTK/webkit-2.12/Source/_javascript_Core
Revision
200174
Author
[email protected]
Date
2016-04-27 23:23:23 -0700 (Wed, 27 Apr 2016)

Log Message

Merge r200125 - [GTK] Fails to build randomly when generating LLIntDesiredOffsets.h
https://bugs.webkit.org/show_bug.cgi?id=155427

Reviewed by Carlos Garcia Campos.

If the build directory contains the -I string, the script that
generates LLIntDesiredOffsets.h will confuse it with an option to
declare an include directory.

In order to avoid that we should only use the arguments that start
with -I when extracting the list of include directories, instead
of using the ones that simply contain that string.

* offlineasm/parser.rb:

Modified Paths

Diff

Modified: releases/WebKitGTK/webkit-2.12/Source/_javascript_Core/ChangeLog (200173 => 200174)


--- releases/WebKitGTK/webkit-2.12/Source/_javascript_Core/ChangeLog	2016-04-28 06:20:10 UTC (rev 200173)
+++ releases/WebKitGTK/webkit-2.12/Source/_javascript_Core/ChangeLog	2016-04-28 06:23:23 UTC (rev 200174)
@@ -1,3 +1,20 @@
+2016-04-27  Alberto Garcia  <[email protected]>
+
+        [GTK] Fails to build randomly when generating LLIntDesiredOffsets.h
+        https://bugs.webkit.org/show_bug.cgi?id=155427
+
+        Reviewed by Carlos Garcia Campos.
+
+        If the build directory contains the -I string, the script that
+        generates LLIntDesiredOffsets.h will confuse it with an option to
+        declare an include directory.
+
+        In order to avoid that we should only use the arguments that start
+        with -I when extracting the list of include directories, instead
+        of using the ones that simply contain that string.
+
+        * offlineasm/parser.rb:
+
 2016-04-15  Zan Dobersek  <[email protected]>
 
         Tail call optimizations lead to crashes on ARM Thumb + Linux

Modified: releases/WebKitGTK/webkit-2.12/Source/_javascript_Core/offlineasm/parser.rb (200173 => 200174)


--- releases/WebKitGTK/webkit-2.12/Source/_javascript_Core/offlineasm/parser.rb	2016-04-28 06:20:10 UTC (rev 200173)
+++ releases/WebKitGTK/webkit-2.12/Source/_javascript_Core/offlineasm/parser.rb	2016-04-28 06:23:23 UTC (rev 200174)
@@ -95,7 +95,7 @@
     end
 
     def self.processIncludeOptions()
-        while ARGV[0][/-I/]
+        while ARGV[0][/^-I/]
             path = ARGV.shift[2..-1]
             if not path
                 path = ARGV.shift
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to