Title: [122907] trunk/Tools
- Revision
- 122907
- Author
- alexis.men...@openbossa.org
- Date
- 2012-07-17 17:58:47 -0700 (Tue, 17 Jul 2012)
Log Message
webkitdirs.pm should fallback to uname -m if arch is not present.
https://bugs.webkit.org/show_bug.cgi?id=91543
Reviewed by Martin Robinson.
It seems that coreutils is moving away from the 'arch' command. Archlinux
for example doesn't ship it anymore (coreutils 8.17). We can then fallback
to 'uname -m' to find out the architecture.
* Scripts/webkitdirs.pm:
(determineArchitecture):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (122906 => 122907)
--- trunk/Tools/ChangeLog 2012-07-18 00:49:59 UTC (rev 122906)
+++ trunk/Tools/ChangeLog 2012-07-18 00:58:47 UTC (rev 122907)
@@ -1,3 +1,17 @@
+2012-07-17 Alexis Menard <alexis.men...@openbossa.org>
+
+ webkitdirs.pm should fallback to uname -m if arch is not present.
+ https://bugs.webkit.org/show_bug.cgi?id=91543
+
+ Reviewed by Martin Robinson.
+
+ It seems that coreutils is moving away from the 'arch' command. Archlinux
+ for example doesn't ship it anymore (coreutils 8.17). We can then fallback
+ to 'uname -m' to find out the architecture.
+
+ * Scripts/webkitdirs.pm:
+ (determineArchitecture):
+
2012-07-17 Dirk Pranke <dpra...@chromium.org>
nrwt: rename printer.print_update to printer.write_update to match metered_stream
Modified: trunk/Tools/Scripts/webkitdirs.pm (122906 => 122907)
--- trunk/Tools/Scripts/webkitdirs.pm 2012-07-18 00:49:59 UTC (rev 122906)
+++ trunk/Tools/Scripts/webkitdirs.pm 2012-07-18 00:58:47 UTC (rev 122907)
@@ -335,6 +335,12 @@
$architecture = `arch`;
chomp $architecture;
}
+
+ if (!$architecture && (isGtk() || isAppleMacWebKit() || isEfl())) {
+ # Fall back to output of `uname -m', if it is present.
+ $architecture = `uname -m`;
+ chomp $architecture;
+ }
}
sub determineNumberOfCPUs
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
