diff options
Diffstat (limited to 'usr/src')
| -rw-r--r-- | usr/src/cmd/perl/5.6.1/utils/lib/ExtUtils/MM_Solaris_ON.pm | 8 | ||||
| -rw-r--r-- | usr/src/cmd/perl/5.8.4/utils/lib/ExtUtils/MM_Solaris_ON.pm | 6 |
2 files changed, 13 insertions, 1 deletions
diff --git a/usr/src/cmd/perl/5.6.1/utils/lib/ExtUtils/MM_Solaris_ON.pm b/usr/src/cmd/perl/5.6.1/utils/lib/ExtUtils/MM_Solaris_ON.pm index 68fc058535..b81146fece 100644 --- a/usr/src/cmd/perl/5.6.1/utils/lib/ExtUtils/MM_Solaris_ON.pm +++ b/usr/src/cmd/perl/5.6.1/utils/lib/ExtUtils/MM_Solaris_ON.pm @@ -1,5 +1,5 @@ # -# Copyright 2004 Sun Microsystems, Inc. All rights reserved. +# Copyright 2006 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # #ident "%Z%%M% %I% %E% SMI" @@ -52,6 +52,12 @@ sub constants # Find all the ENVCPPFLAGS[1-n] environment variables my (%inc_seen, @newincs, %proto_seen, @protos); + + # Prepopulate @protos with $ENV{ROOT} if it is set + if (defined ($ENV{ROOT})) { + push(@protos, $ENV{ROOT}); + } + foreach my $ip (map({ /^ENVCPPFLAGS\d+$/ ? split(' ', $ENV{$_}) : () } keys(%ENV))) { # Ignore everything except '-I' flags diff --git a/usr/src/cmd/perl/5.8.4/utils/lib/ExtUtils/MM_Solaris_ON.pm b/usr/src/cmd/perl/5.8.4/utils/lib/ExtUtils/MM_Solaris_ON.pm index 11f32c83c7..7c9de407ee 100644 --- a/usr/src/cmd/perl/5.8.4/utils/lib/ExtUtils/MM_Solaris_ON.pm +++ b/usr/src/cmd/perl/5.8.4/utils/lib/ExtUtils/MM_Solaris_ON.pm @@ -88,6 +88,12 @@ sub constants # Find all the ENVCPPFLAGS[1-n] environment variables my (%inc_seen, @newincs, %proto_seen, @protos); + + # Prepopulate @protos with $ENV{ROOT} if it is set + if (defined ($ENV{ROOT})) { + push(@protos, $ENV{ROOT}); + } + foreach my $ip (map({ /^ENVCPPFLAGS\d+$/ ? split(' ', $ENV{$_}) : () } sort(keys(%ENV)))) { # Ignore everything except '-I' flags. |