dougm 01/11/02 09:23:54
Modified: lib/Apache Build.pm
Log:
os cflags fixups need happen in perl_ccopts so generated Makefile.PLs get the changes
Revision Changes Path
1.71 +9 -7 modperl-2.0/lib/Apache/Build.pm
Index: Build.pm
===================================================================
RCS file: /home/cvs/modperl-2.0/lib/Apache/Build.pm,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- Build.pm 2001/10/22 03:57:59 1.70
+++ Build.pm 2001/11/02 17:23:54 1.71
@@ -195,14 +195,21 @@
}
sub perl_ccopts {
- shift->strip_lfs(" $Config{ccflags} ");
+ my $cflags = shift->strip_lfs(" $Config{ccflags} ");
+
+ my $fixup = \&{"ccopts_$^O"};
+ if (defined &$fixup) {
+ $fixup->(\$cflags);
+ }
+
+ $cflags;
}
sub ccopts_hpux {
my $cflags = shift;
#return if $Config{cc} eq 'gcc'; #XXX?
return if $$cflags =~ /(-Ae|\+e)/;
- $$cflags .= " -Ae";
+ $$cflags .= " -Ae ";
}
sub ccopts {
@@ -210,11 +217,6 @@
my $cflags = $self->perl_ccopts . ExtUtils::Embed::perl_inc() .
$self->ap_ccopts;
-
- my $fixup = \&{"ccopts_$^O"};
- if (defined &$fixup) {
- $fixup->(\$cflags);
- }
$cflags;
}