Permalink
Browse files

Comment out all set_p5 calls.

git-svn-id: https://svn.parrot.org/parrot/branches/configtests@42501 d31e2699-5ff4-0310-a27c-f18f2fbe73fe
  • Loading branch information...
1 parent 418467d commit de92cc99b3bef8c094e579ec2624376bb8add87f jkeenan committed Nov 14, 2009
Showing with 33 additions and 18 deletions.
  1. +33 −18 config/init/defaults.pm
@@ -49,25 +49,36 @@ sub runstep {
# special keys within the Parrot::Configure object.
# This is a multi-stage process.
- # Stage 1:
- foreach my $orig ( qw|
- longsize
- use64bitint
- | ) {
- $conf->data->set_p5( $orig => $Config{$orig} );
- }
+# # Stage 1:
+# foreach my $orig ( qw|
+# longsize
+# | ) {
+# $conf->data->set_p5( $orig => $Config{$orig} );
+# }
+#
+# # Stage 2 (anticipating needs of config/auto/headers.pm):
+# $conf->data->set_p5(
+# map { $_ => $Config{$_} } grep { /^i_/ } keys %Config
+# );
+#
+# # Stage 3 (Along similar lines, look up values from Perl 5 special
+# # variables and stash them for later lookups. Name them according
+# # to their 'use English' names as documented in 'perlvar'.)
+# $conf->data->set_p5( OSNAME => $^O );
- # Stage 2 (anticipating needs of config/auto/headers.pm):
- $conf->data->set_p5(
- map { $_ => $Config{$_} } grep { /^i_/ } keys %Config
- );
-
- # Stage 3 (Along similar lines, look up values from Perl 5 special
- # variables and stash them for later lookups. Name them according
- # to their 'use English' names as documented in 'perlvar'.)
- $conf->data->set_p5( OSNAME => $^O );
+ # Later configuration steps need access to values from the Perl 5
+ # %Config. However, other later configuration steps may change
+ # the corresponding values in the Parrot::Configure object. In
+ # order to provide access to the original values from Perl 5
+ # %Config, we grab those settings we need now and store them in
+ # special keys within the Parrot::Configure object. We label these keys
+ # '_provisional' to alert users that these should only be used during
+ # configuration and testing of configuration steps. They should not be
+ # used during Parrot's build, nor should they be used in 'make test'.
+ #
+ # This is a multi-stage process.
- # configtests branch: We start to handle these things differently.
+ # Stage 1:
foreach my $orig ( qw|
archname
ccflags
@@ -80,10 +91,14 @@ sub runstep {
$conf->data->set( qq|${orig}_provisional| => $Config{$orig} );
}
+ # Stage 2 (anticipating needs of config/auto/headers.pm):
$conf->data->set(
-# map { qq|${_}_provisional| => $Config{$_} } grep { /^i_/ } keys %Config
map { $_ . q{_provisional} => $Config{$_} } grep { /^i_/ } keys %Config
);
+
+ # Stage 3 (Along similar lines, look up values from Perl 5 special
+ # variables and stash them for later lookups. Name them according
+ # to their 'use English' names as documented in 'perlvar'.)
$conf->data->set( OSNAME_provisional => $^O );
my $ccdlflags = $Config{ccdlflags};

0 comments on commit de92cc9

Please sign in to comment.