Changeset 152601 in webkit

Timestamp:

Jul 12, 2013 11:57:35 AM (11 years ago)

Author:

commit-queue@webkit.org

Message:

[Tools] Ignore missing GNUmakefile when detecting previous arch in build-webkit
​https://bugs.webkit.org/show_bug.cgi?id=91223

Patch by Emanuele Aina <Emanuele Aina> on 2013-07-12
Reviewed by Martin Robinson.

When run on a clean checkout, build-webkit complains that no
GNUmakefile exists when trying to detect the previously configured
architecture, but in this case there's no previous configuration so
the warning is pointless.

• Scripts/webkitdirs.pm:

(determineArchitecture): Redirect grep stderr to /dev/null.

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitdirs.pm (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2013-07-12  Emanuele Aina  <emanuele.aina@collabora.com>
+
+        [Tools] Ignore missing GNUmakefile when detecting previous arch in build-webkit
+        https://bugs.webkit.org/show_bug.cgi?id=91223
+
+        Reviewed by Martin Robinson.
+
+        When run on a clean checkout, `build-webkit` complains that no
+        GNUmakefile exists when trying to detect the previously configured
+        architecture, but in this case there's no previous configuration so
+        the warning is pointless.
+
+        * Scripts/webkitdirs.pm:
+        (determineArchitecture): Redirect grep stderr to /dev/null.
+
 2013-07-12  Brian Holt  <brian.holt@samsung.com>
 

trunk/Tools/Scripts/webkitdirs.pm

@@ -295 +295 @@
     if (isGtk()) {
         determineConfigurationProductDir();
-        my $host_triple = `grep -E '^host = ' $configurationProductDir/GNUmakefile`;
+        my $host_triple = `grep -E '^host = ' $configurationProductDir/GNUmakefile 2> /dev/null`;
         if ($host_triple =~ m/^host = ([^-]+)-/) {
             # We have a configured build tree; use it.