Reviewed by Darin.

        Exit gracefully if $ENV{'CURRENT_ARCH'} is undefined. Rolling out my previous change.

        * Scripts/check-for-global-initializers:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@13545 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 9a7a1d293a5ab14207ba8e76676bc5940c71cbda..a786b1de491fca6d5787eafba684b8e365553978 100644 (file)
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,11 @@
+2006-03-28  Timothy Hatcher  <timothy@apple.com>
+
+        Reviewed by Darin.
+
+        Exit gracefully if $ENV{'CURRENT_ARCH'} is undefined. Rolling out my previous change.
+
+        * Scripts/check-for-global-initializers:
+
 2006-03-28  Timothy Hatcher  <timothy@apple.com>
 
         Build fix. Turn off uninitialized warnings for the first block of code.

diff --git a/WebKitTools/Scripts/check-for-global-initializers b/WebKitTools/Scripts/check-for-global-initializers
index 2d27ff05817e4dde290cc08be792428bf192eb35..d566bfb285499dd072be39cb3fdb0c4feec0b64e 100755 (executable)
--- a/WebKitTools/Scripts/check-for-global-initializers
+++ b/WebKitTools/Scripts/check-for-global-initializers
@@ -34,13 +34,17 @@
 use warnings;
 use strict;
 
-no warnings 'uninitialized'; # FIXME: turn off uninitialized warnings so the following code works
-
 my $arch = $ENV{'CURRENT_ARCH'};
 my $configuration = $ENV{'CONFIGURATION'};
 my $target = $ENV{'TARGET_NAME'};
 my $variant = $ENV{'CURRENT_VARIANT'};
 
+if (!$arch) {
+    print "Not checking for global initializers because CURRENT_ARCH is not defined.\n";
+    print "Probably means you have Xcode 2.1.\n";
+    exit;
+}
+
 my $list = $ENV{"LINK_FILE_LIST_${variant}_${arch}"};
 
 if (!open LIST, $list) {
@@ -48,8 +52,6 @@ if (!open LIST, $list) {
     exit 1;
 }
 
-use warnings; # turn all warnings back on
-
 my @files = <LIST>;
 chomp @files;
 close LIST;