[svn:parrot] r45030 - in trunk: . config/init

[petdance at svn.parrot.org]

Author: petdance
Date: Thu Mar 18 21:27:46 2010
New Revision: 45030
URL: https://trac.parrot.org/parrot/changeset/45030

Log:
Don't carry over ccflags and ccwarn from Perl 5 if we specify cc

Modified:
   trunk/NEWS
   trunk/config/init/defaults.pm

Modified: trunk/NEWS
==============================================================================
--- trunk/NEWS	Thu Mar 18 21:25:43 2010	(r45029)
+++ trunk/NEWS	Thu Mar 18 21:27:46 2010	(r45030)
@@ -7,6 +7,7 @@
 - Deprecations
 - API
 - Platforms
+  + Improved handling of new compilers
 - Bugfix
 - Tests
 - Tools

Modified: trunk/config/init/defaults.pm
==============================================================================
--- trunk/config/init/defaults.pm	Thu Mar 18 21:25:43 2010	(r45029)
+++ trunk/config/init/defaults.pm	Thu Mar 18 21:27:46 2010	(r45030)
@@ -80,6 +80,7 @@
     my $ccdlflags = $Config{ccdlflags};
     $ccdlflags =~ s/\s*-Wl,-rpath,\S*//g if $conf->options->get('disable-rpath');
 
+    my $cc_option = $conf->options->get('cc');
     # We need a Glossary somewhere!
     $conf->data->set(
         debugging => $conf->options->get('debugging') ? 1 : 0,
@@ -92,9 +93,10 @@
 
         # Compiler -- used to turn .c files into object files.
         # (Usually cc or cl, or something like that.)
-        cc      => $Config{cc},
-        ccflags => $Config{ccflags},
-        ccwarn  => exists( $Config{ccwarn} ) ? $Config{ccwarn} : '',
+        cc      => $cc_option ? $cc_option : $Config{cc},
+        # If we specify a compiler, we can't use existing ccflags and ccwarn.
+        ccflags => $cc_option ? ''         : $Config{ccflags},
+        ccwarn  => $cc_option ? ''         : $Config{ccwarn},
 
         # Flags used to indicate this object file is to be compiled
         # with position-independent code suitable for dynamic loading.