Title: [248075] trunk/Tools
- Revision
- 248075
- Author
- [email protected]
- Date
- 2019-07-31 14:36:59 -0700 (Wed, 31 Jul 2019)
Log Message
[GTK][WPE] Fix gtkdoc build with "build-webkit --32-bit" on 64-bit hosts
https://bugs.webkit.org/show_bug.cgi?id=200306
Patch by Loïc Yhuel <[email protected]> on 2019-07-31
Reviewed by Michael Catanzaro.
gtkdoc-scangobj calls scangobj.py, which only uses LDFLAGS on link (when producing
jsc-glib-4.0-scan for example).
* Scripts/webkitdirs.pm:
(generateBuildSystemFromCMakeProject):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (248074 => 248075)
--- trunk/Tools/ChangeLog 2019-07-31 21:34:26 UTC (rev 248074)
+++ trunk/Tools/ChangeLog 2019-07-31 21:36:59 UTC (rev 248075)
@@ -1,3 +1,16 @@
+2019-07-31 Loïc Yhuel <[email protected]>
+
+ [GTK][WPE] Fix gtkdoc build with "build-webkit --32-bit" on 64-bit hosts
+ https://bugs.webkit.org/show_bug.cgi?id=200306
+
+ Reviewed by Michael Catanzaro.
+
+ gtkdoc-scangobj calls scangobj.py, which only uses LDFLAGS on link (when producing
+ jsc-glib-4.0-scan for example).
+
+ * Scripts/webkitdirs.pm:
+ (generateBuildSystemFromCMakeProject):
+
2019-07-31 Ryan Haddad <[email protected]>
Unreviewed test gardening, disable failing test for rdar://52355829.
Modified: trunk/Tools/Scripts/webkitdirs.pm (248074 => 248075)
--- trunk/Tools/Scripts/webkitdirs.pm 2019-07-31 21:34:26 UTC (rev 248074)
+++ trunk/Tools/Scripts/webkitdirs.pm 2019-07-31 21:36:59 UTC (rev 248075)
@@ -2265,6 +2265,7 @@
push @cmakeArgs, '-DFORCE_32BIT=ON -DCMAKE_PREFIX_PATH="/usr" -DCMAKE_LIBRARY_ARCHITECTURE=x86';
$ENV{"CFLAGS"} = "-m32" . ($ENV{"CFLAGS"} || "");
$ENV{"CXXFLAGS"} = "-m32" . ($ENV{"CXXFLAGS"} || "");
+ $ENV{"LDFLAGS"} = "-m32" . ($ENV{"LDFLAGS"} || "");
}
push @args, @cmakeArgs if @cmakeArgs;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
