From: Rafael Garcia-Suarez <rgarciasuarez@gmail.com>
Date: Thu, 16 Jun 2005 08:29:10 +0000 (+0000)
Subject: Revert part of change #24854
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=f5542d3a54f14f881b60902316767ce068dbe5dd;p=p5sagit%2Fp5-mst-13.2.git

Revert part of change #24854
p4raw-link: @24854 on //depot/perl: ab019eaa775fdcae8aaf709315c7ba85a788ee6c

p4raw-id: //depot/perl@24861
---

diff --git a/ext/Devel/DProf/t/DProf.t b/ext/Devel/DProf/t/DProf.t
index 84bc927..afffaea 100644
--- a/ext/Devel/DProf/t/DProf.t
+++ b/ext/Devel/DProf/t/DProf.t
@@ -17,7 +17,6 @@ END {
 }
 
 use Benchmark qw( timediff timestr );
-use Config;
 use Getopt::Std 'getopts';
 getopts('vI:p:');
 
@@ -46,11 +45,10 @@ sub profile {
 	my $test = shift;
 	my @results;
 	local $ENV{PERL5LIB} = $perl5lib;
-	my $opt_f = $Config{ccflags} =~ /USE_SITECUSTOMIZE/ ? '-f' : '';
 	my $opt_d = '-d:DProf';
 
 	my $t_start = new Benchmark;
-	open( R, "$perl $opt_f \"$opt_d\" $test |" ) || warn "$0: Can't run. $!\n";
+	open( R, "$perl -f \"$opt_d\" $test |" ) || warn "$0: Can't run. $!\n";
 	@results = <R>;
 	close R or warn "Could not close: $!";
 	my $t_total = timediff( new Benchmark, $t_start );
diff --git a/perl.c b/perl.c
index 3df8519..7cb4fdf 100644
--- a/perl.c
+++ b/perl.c
@@ -1378,13 +1378,13 @@ S_parse_body(pTHX_ char **env, XSINIT_t xsinit)
 	    sv_catpv(PL_e_script, "\n");
 	    break;
 
-#ifdef USE_SITECUSTOMIZE
 	case 'f':
+#ifdef USE_SITECUSTOMIZE
 	    minus_f = TRUE;
+#endif
 	    s++;
 	    goto reswitch;
 
-#endif
 	case 'I':	/* -I handled both here and in moreswitches() */
 	    forbid_setid("-I");
 	    if (!*++s && (s=argv[1]) != Nullch) {
@@ -2439,9 +2439,7 @@ S_usage(pTHX_ const char *name)		/* XXX move this out into a module ? */
 "-d[:debugger]     run program under debugger",
 "-D[number/list]   set debugging flags (argument is a bit mask or alphabets)",
 "-e program        one line of program (several -e's allowed, omit programfile)",
-#ifdef USE_SITECUSTOMIZE
 "-f                don't do $sitelib/sitecustomize.pl at startup",
-#endif
 "-F/pattern/       split() pattern for -a switch (//'s are optional)",
 "-i[extension]     edit <> files in place (makes backup if extension supplied)",
 "-Idirectory       specify @INC/#include directory (several -I's allowed)",