Ticket #1457: modified_remove_cxx.diff

t/steps/init/defaults-01.t

@@ -5 +5 @@
 
 use strict;
 use warnings;
-use Test::More tests => 39;
+use Test::More tests => 37;
 use Carp;
 use Cwd;
 use File::Copy;
@@ -85 +85 @@
 
 $conf->data->set( archname => 'x86_64' );
 $conf->data->set( cc => 'cc' );
-$conf->data->set( cxx => 'c++' );
 $conf->data->set( link => 'cc' );
 $conf->data->set( ld => 'env cc' );
 $conf->data->set( ld_load_flags => '-bundle -L/usr/local/lib64' );
@@ -96 +95 @@
     "_64_bit_adjustments() returned true");
 is($conf->data->get( 'archname' ), 'i386', "Got expected value for 'archname'");
 is($conf->data->get( 'cc' ), 'cc -m32', "Got expected value for 'cc'");
-is($conf->data->get( 'cxx' ), 'c++ -m32', "Got expected value for 'cxx'");
 is($conf->data->get( 'link' ), 'cc -m32', "Got expected value for 'link'");
 is($conf->data->get( 'ld' ), 'env cc -m32', "Got expected value for 'ld'");
 is($conf->data->get( 'ld_load_flags' ), '-bundle -L/usr/local/lib',
@@ -124 +122 @@
 
 $conf->data->set( archname => 'x86_64' );
 $conf->data->set( cc => 'cc' );
-$conf->data->set( cxx => 'c++' );
 $conf->data->set( link => 'cc' );
 $conf->data->set( ld => 'env cc' );
 $conf->data->set( ld_load_flags => '-bundle -L/usr/local/lib64' );
@@ -135 +132 @@
     "_64_bit_adjustments() returned true");
 is($conf->data->get( 'archname' ), 'x86_64', "Got expected value for 'archname'");
 is($conf->data->get( 'cc' ), 'cc', "Got expected value for 'cc'");
-is($conf->data->get( 'cxx' ), 'c++', "Got expected value for 'cxx'");
 is($conf->data->get( 'link' ), 'cc', "Got expected value for 'link'");
 is($conf->data->get( 'ld' ), 'env cc', "Got expected value for 'ld'");
 is($conf->data->get( 'ld_load_flags' ), '-bundle -L/usr/local/lib64',

config/inter/progs.pm

@@ -75 +75 @@
     my ($conf, $ask) = @_;
     # Set each variable individually so that hints files can use them as
     # triggers to help pick the correct defaults for later answers.
-    my ( $cc, $cxx, $link, $ld, $ccflags, $linkflags, $ldflags, $libs, $lex, $yacc );
+    my ( $cc, $link, $ld, $ccflags, $linkflags, $ldflags, $libs, $lex, $yacc );
     $cc = integrate( $conf->data->get('cc'), $conf->options->get('cc') );
     $cc = prompt( "What C compiler do you want to use?", $cc )
         if $ask;
@@ -124 +124 @@
         if $ask;
     $conf->data->set( libs => $libs );
 
-    $cxx = integrate( $conf->data->get('cxx'), $conf->options->get('cxx') );
-    $cxx = prompt( "What C++ compiler do you want to use?", $cxx ) if $ask;
-    $conf->data->set( cxx => $cxx );
     return ($conf, $cc);
 }
 

config/init/defaults.pm

@@ -102 +102 @@
         # with position-independent code suitable for dynamic loading.
         cc_shared => $Config{cccdlflags},    # e.g. -fpic for GNU cc.
 
-        # C++ compiler -- used to compile parts of ICU.  ICU's configure
-        # will try to find a suitable compiler, but it prefers GNU c++ over
-        # a system c++, which might not be appropriate.  This setting
-        # allows you to override ICU's guess, but is otherwise currently
-        # unset.  Ultimately, it should be set to whatever ICU figures
-        # out, or parrot should look for it and always tell ICU what to
-        # use.
-        cxx => 'c++',
-
         # Linker, used to link object files (plus libraries) into
         # an executable.  It is usually $cc on Unix-ish systems.
         # VMS and Win32 might use "Link".
@@ -285 +276 @@
             $archname =~ s/x86_64/i386/;
 
             # adjust gcc?
-            for my $cc qw(cc cxx link ld) {
+            for my $cc qw(cc link ld) {
                 $conf->data->add( ' ', $cc, '-m32' );
             }
 

config/init/hints/irix.pm

@@ -27 +27 @@
     $conf->data->set( libs => $libs );
 
     my $cc   = $conf->data->get('cc');
-    my $cxx  = $conf->data->get('cxx');
     my $ld   = $conf->data->get('ld');
     my $link = $conf->data->get('link');
     if ( $cc =~ /cc -64/ ) {
-        $cxx  = 'CC -64';
         $ld   = 'CC -64';
         $link = 'CC -64';
         $conf->data->set(
-            cxx  => $cxx,
             ld   => $ld,
             link => $link,
         );

t/steps/inter/progs-04.t

@@ -56 +56 @@
         linkflags
         ldflags
         libs
-        cxx
     |
     )
 {