[svn:parrot] r44037 - branches/rm_cflags/config/auto
coke at svn.parrot.org
coke at svn.parrot.org
Tue Feb 16 19:27:35 UTC 2010
Author: coke
Date: Tue Feb 16 19:27:34 2010
New Revision: 44037
URL: https://trac.parrot.org/parrot/changeset/44037
Log:
Turns out @ccwarn@, though referenced, was not defined for the common gcc case.
(everything was dumped into ccflags)
Change this, so we can override it.
Modified:
branches/rm_cflags/config/auto/warnings.pm
Modified: branches/rm_cflags/config/auto/warnings.pm
==============================================================================
--- branches/rm_cflags/config/auto/warnings.pm Tue Feb 16 19:09:14 2010 (r44036)
+++ branches/rm_cflags/config/auto/warnings.pm Tue Feb 16 19:27:34 2010 (r44037)
@@ -222,7 +222,8 @@
$conf->cc_gen('config/auto/warnings/test_c.in');
my $ccflags = $conf->data->get('ccflags');
- my $tryflags = "$ccflags $warning";
+ my $warnings = $conf->data->get('ccwarn'). ' ' . $warning;
+ my $tryflags = "$ccflags $warnings";
my $command_line = Parrot::Configure::Utils::_build_compile_command( $cc, $tryflags );
$verbose and print " ", $command_line, "\n";
@@ -242,7 +243,7 @@
my $output = Parrot::BuildUtil::slurp_file($output_file);
unlink $output_file or die "Unable to unlink $output_file: $!";
- return _set_ccflags($conf, $output, $tryflags, $verbose);
+ return _set_ccwarn($conf, $output, $warnings, $verbose);
}
sub _set_warning {
@@ -251,13 +252,13 @@
$conf->data->set( $warning => !$exit_code || 0 );
}
-sub _set_ccflags {
- my ($conf, $output, $tryflags, $verbose) = @_;
+sub _set_ccwarn {
+ my ($conf, $output, $warnings, $verbose) = @_;
$verbose and print " output: $output\n";
if ( $output !~ /error|warning|not supported/i ) {
- $conf->data->set( ccflags => $tryflags );
- $verbose and print " ccflags: ", $conf->data->get("ccflags"), "\n";
+ $conf->data->set( ccwarn => $warnings );
+ $verbose and print " ccwarn: ", $conf->data->get("ccwarn"), "\n";
return 1;
}
else {
More information about the parrot-commits
mailing list