19 lines
1022 B
Diff
19 lines
1022 B
Diff
|
--- dist/ExtUtils-CBuilder/lib/ExtUtils/CBuilder/Base.pm.orig 2011-05-26 09:23:49.000000000 +0000
|
||
|
|
+++ dist/ExtUtils-CBuilder/lib/ExtUtils/CBuilder/Base.pm 2011-05-26 09:26:10.000000000 +0000
|
||
|
|
@@ -40,11 +40,13 @@ sub new {
|
||
|
|
$self->{config}{$k} = $v unless exists $self->{config}{$k};
|
||
|
|
}
|
||
|
|
$self->{config}{cc} = $ENV{CC} if defined $ENV{CC};
|
||
|
|
- $self->{config}{ccflags} = $ENV{CFLAGS} if defined $ENV{CFLAGS};
|
||
|
|
+ $self->{config}{ccflags} = join(" ", $self->{config}{ccflags}, $ENV{CFLAGS})
|
||
|
|
+ if defined $ENV{CFLAGS};
|
||
|
|
$self->{config}{cxx} = $ENV{CXX} if defined $ENV{CXX};
|
||
|
|
$self->{config}{cxxflags} = $ENV{CXXFLAGS} if defined $ENV{CXXFLAGS};
|
||
|
|
$self->{config}{ld} = $ENV{LD} if defined $ENV{LD};
|
||
|
|
- $self->{config}{ldflags} = $ENV{LDFLAGS} if defined $ENV{LDFLAGS};
|
||
|
|
+ $self->{config}{ldflags} = join(" ", $self->{config}{ldflags}, $ENV{LDFLAGS})
|
||
|
|
+ if defined $ENV{LDFLAGS};
|
||
|
|
|
||
|
|
unless ( exists $self->{config}{cxx} ) {
|
||
|
|
my ($ccpath, $ccbase, $ccsfx ) = fileparse($self->{config}{cc}, qr/\.[^.]*/);
|