1 files changed, 1 insertions, 28 deletions

diff --git a/WebKitTools/Scripts/build-webkit b/WebKitTools/Scripts/build-webkit
index f4c99e6..4cd8817 100755
--- a/WebKitTools/Scripts/build-webkit
+++ b/WebKitTools/Scripts/build-webkit
@@ -39,7 +39,6 @@ use POSIX;
 
 my $originalWorkingDirectory = getcwd();
 
-my $crossDocumentMessagingSupport = 1;
 my $databaseSupport = 1;
 my $iconDatabaseSupport = 1;
 my $svgSupport = 1;
@@ -56,17 +55,11 @@ my $coverageSupport = 0;
 my $videoSupport = isOSX() || isCygwin(); # Enable by default on OSX and Windows
 my $showHelp = 0;
 my $clean = 0;
-my $buildUniversal = 0;
-my $buildSixtyFourBit = 0;
 
 my $programName = basename($0);
 my $usage = <<EOF;
 Usage: $programName [options] [options to pass to build system]
   --help                        Show this help message
-  --clean                       Perform a clean build
-  --universal                   Build 2-way universal (PPC and Intel 32-bit)
-  --64-bit                      Build 64-bit, combine with --universal to build 4-way universal
-  --[no-]cross-document-messaging   Toggle cross-document messaging support (default: $crossDocumentMessagingSupport)
   --[no-]database               Toggle Database Support (default: $databaseSupport)
   --[no-]icon-database          Toggle Icon database support (default: $iconDatabaseSupport)
   --[no-]svg                    Toggle SVG support (default: $svgSupport)
@@ -84,8 +77,7 @@ Usage: $programName [options] [options to pass to build system]
   --[no-]coverage               Toggle code coverage support (default: $coverageSupport)
 EOF
 
-GetOptions('cross-document-messaging!' => \$crossDocumentMessagingSupport,
-           'database!' => \$databaseSupport,
+GetOptions('database!' => \$databaseSupport,
            'icon-database!' => \$iconDatabaseSupport,
            'svg!' => \$svgSupport,
            'svg-experimental!' => \$svgExperimentalSupport,
@@ -100,8 +92,6 @@ GetOptions('cross-document-messaging!' => \$crossDocumentMessagingSupport,
            'video!' => \$videoSupport,
            'coverage!' => \$coverageSupport,
            'help' => \$showHelp,
-           'universal' => \$buildUniversal,
-           '64-bit' => \$buildSixtyFourBit,
            'clean' => \$clean);
 
 if ($showHelp) {
@@ -150,7 +140,6 @@ if (isWx()) {
 my $productDir = productDir();
 my @overrideFeatureDefinesOption = ();
 
-push @overrideFeatureDefinesOption, "ENABLE_CROSS_DOCUMENT_MESSAGING" if $crossDocumentMessagingSupport;
 push @overrideFeatureDefinesOption, "ENABLE_DATABASE" if $databaseSupport;
 push @overrideFeatureDefinesOption, "ENABLE_ICONDATABASE" if $iconDatabaseSupport;
 push @overrideFeatureDefinesOption, "ENABLE_SVG" if $svgSupport;
@@ -190,24 +179,8 @@ if ($clean && isOSX()) {
     push(@options, "clean");
 }
 
-if ($buildSixtyFourBit && isOSX()) {
-    my $cpuVendor = `sysctl -n machdep.cpu.vendor`;
-    chomp $cpuVendor;
-
-    if ($buildUniversal) {
-        push(@options, "ARCHS=ppc ppc64 i386 x86_64");
-    } elsif ($cpuVendor eq "GenuineIntel") {
-        push(@options, "ARCHS=i386 x86_64");
-    } else {
-        push(@options, "ARCHS=ppc ppc64");
-    }
-} elsif ($buildUniversal && isOSX()) {
-    push(@options, "ARCHS=ppc i386");
-}
-
 # enable autotool options accordingly
 if ($ENV{WEBKITAUTOTOOLS}) {
-    push @options, autotoolsFlag($crossDocumentMessagingSupport, "cross-document-messaging");
     push @options, autotoolsFlag($databaseSupport, "database");
     push @options, autotoolsFlag($iconDatabaseSupport, "icon-database");
     push @options, autotoolsFlag($svgSupport, "svg");