[svn:parrot] r45323 - in trunk: config/init config/init/hints config/inter t/steps/init t/steps/inter
bubaflub at svn.parrot.org
bubaflub at svn.parrot.org
Tue Mar 30 16:45:07 UTC 2010
Author: bubaflub
Date: Tue Mar 30 16:45:07 2010
New Revision: 45323
URL: https://trac.parrot.org/parrot/changeset/45323
Log:
[TT #1457] remove --cxx option from Configure.pl, patch by coke++ and jkeenan++
Modified:
trunk/config/init/defaults.pm
trunk/config/init/hints/irix.pm
trunk/config/inter/progs.pm
trunk/t/steps/init/defaults-01.t
trunk/t/steps/inter/progs-04.t
Modified: trunk/config/init/defaults.pm
==============================================================================
--- trunk/config/init/defaults.pm Tue Mar 30 16:26:59 2010 (r45322)
+++ trunk/config/init/defaults.pm Tue Mar 30 16:45:07 2010 (r45323)
@@ -102,15 +102,6 @@
# 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,7 +276,7 @@
$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' );
}
Modified: trunk/config/init/hints/irix.pm
==============================================================================
--- trunk/config/init/hints/irix.pm Tue Mar 30 16:26:59 2010 (r45322)
+++ trunk/config/init/hints/irix.pm Tue Mar 30 16:45:07 2010 (r45323)
@@ -27,15 +27,12 @@
$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,
);
Modified: trunk/config/inter/progs.pm
==============================================================================
--- trunk/config/inter/progs.pm Tue Mar 30 16:26:59 2010 (r45322)
+++ trunk/config/inter/progs.pm Tue Mar 30 16:45:07 2010 (r45323)
@@ -75,7 +75,7 @@
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,9 +124,6 @@
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);
}
Modified: trunk/t/steps/init/defaults-01.t
==============================================================================
--- trunk/t/steps/init/defaults-01.t Tue Mar 30 16:26:59 2010 (r45322)
+++ trunk/t/steps/init/defaults-01.t Tue Mar 30 16:45:07 2010 (r45323)
@@ -5,7 +5,7 @@
use strict;
use warnings;
-use Test::More tests => 39;
+use Test::More tests => 37;
use Carp;
use Cwd;
use File::Copy;
@@ -85,7 +85,6 @@
$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,7 +95,6 @@
"_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,7 +122,6 @@
$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,7 +132,6 @@
"_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',
Modified: trunk/t/steps/inter/progs-04.t
==============================================================================
--- trunk/t/steps/inter/progs-04.t Tue Mar 30 16:26:59 2010 (r45322)
+++ trunk/t/steps/inter/progs-04.t Tue Mar 30 16:45:07 2010 (r45323)
@@ -56,7 +56,6 @@
linkflags
ldflags
libs
- cxx
|
)
{
More information about the parrot-commits
mailing list