Title: [105974] trunk/Tools
- Revision
- 105974
- Author
- rga...@webkit.org
- Date
- 2012-01-26 01:01:21 -0800 (Thu, 26 Jan 2012)
Log Message
[GTK] Detect cross-compilation in webkitdirs.pm to not generate gtkdoc
https://bugs.webkit.org/show_bug.cgi?id=76138
Reviewed by Martin Robinson.
* Scripts/webkitdirs.pm:
(isCrossCompilation):
(buildAutotoolsProject):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (105973 => 105974)
--- trunk/Tools/ChangeLog 2012-01-26 08:56:21 UTC (rev 105973)
+++ trunk/Tools/ChangeLog 2012-01-26 09:01:21 UTC (rev 105974)
@@ -1,3 +1,14 @@
+2012-01-26 Gabor Rapcsanyi <rga...@webkit.org>
+
+ [GTK] Detect cross-compilation in webkitdirs.pm to not generate gtkdoc
+ https://bugs.webkit.org/show_bug.cgi?id=76138
+
+ Reviewed by Martin Robinson.
+
+ * Scripts/webkitdirs.pm:
+ (isCrossCompilation):
+ (buildAutotoolsProject):
+
2012-01-25 Adam Barth <aba...@webkit.org>
Kentaro is a reviewer now. Yay!
Modified: trunk/Tools/Scripts/webkitdirs.pm (105973 => 105974)
--- trunk/Tools/Scripts/webkitdirs.pm 2012-01-26 08:56:21 UTC (rev 105973)
+++ trunk/Tools/Scripts/webkitdirs.pm 2012-01-26 09:01:21 UTC (rev 105974)
@@ -1232,6 +1232,19 @@
return $Config{archname} =~ /^arm-/;
}
+sub isCrossCompilation()
+{
+ my $compiler = $ENV{'CC'};
+ if ($compiler =~ /gcc/) {
+ my $compiler_options = `$compiler -v 2>&1`;
+ my @host = $compiler_options =~ m/--host=(.*?)\s/;
+ my @target = $compiler_options =~ m/--target=(.*?)\s/;
+
+ return ($host[0] ne "" && $target[0] ne "" && $host[0] ne $target[0]);
+ }
+ return 0;
+}
+
sub isAppleWebKit()
{
return !(isQt() or isGtk() or isWx() or isChromium() or isEfl() or isWinCE() or isBlackBerry());
@@ -1907,7 +1920,7 @@
chdir ".." or die;
- if ($project eq 'WebKit') {
+ if ($project eq 'WebKit' && !isCrossCompilation()) {
my @docGenerationOptions = ($runWithJhbuild, "$gtkScriptsPath/generate-gtkdoc", "--skip-html");
if ($debug) {
push(@docGenerationOptions, "--debug");
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
