simcop2387/DBD-SQLite-SQLcipher
1
0
Fork 0
mirror of https://github.com/DBD-SQLite/DBD-SQLite synced 2025-06-08 14:48:32 -04:00
Code Issues Releases Wiki Activity

moved gnu99 stuff to CCFLAGS

Browse source
This commit is contained in:
Kenichi Ishigaki 2014-06-12 13:56:36 +09:00
parent 509df15588
commit d2b402f87f
1 changed files with 19 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
Makefile.PL
View file

@ -255,13 +255,7 @@ if ($^O =~ /bsd/i && $^O !~ /(?:open|net)bsd/) {
push @CC_DEFINE, '-D_XOPEN_SOURCE'; push @CC_DEFINE, '-D_XOPEN_SOURCE';
} }
my @CC_OPTIONS = ( my (@CCFLAGS, @LDFLAGS, @LDDLFLAGS);
INC => join( ' ', @CC_INC ),
DEFINE => join( ' ', @CC_DEFINE ),
( @CC_LIBS ? (
LIBS => join( ' ', @CC_LIBS )
) : () ),
);
# RT #70135: See if ld supports Bsymbolic; # RT #70135: See if ld supports Bsymbolic;
unless ($^O eq 'MSWin32' && $Config{ld} =~ /link/) { unless ($^O eq 'MSWin32' && $Config{ld} =~ /link/) {
@ -270,16 +264,28 @@ unless ($^O eq 'MSWin32' && $Config{ld} =~ /link/) {
my $devnull = File::Spec->devnull; my $devnull = File::Spec->devnull;
my $output = `$path/ld --help 2>$devnull`; my $output = `$path/ld --help 2>$devnull`;
if ($output =~ /Bsymbolic/) { if ($output =~ /Bsymbolic/) {
push @CC_OPTIONS, push @CCFLAGS, '-Wl,-Bsymbolic';
CCFLAGS => $Config{ccflags} . ' -Wl,-Bsymbolic', push @LDFLAGS, '-Wl,-Bsymbolic';
LDFLAGS => $Config{ldflags} . ' -Wl,-Bsymbolic', push @LDDLFLAGS, '-Wl,-Bsymbolic';
LDDLFLAGS => $Config{lddlflags} . ' -Wl,-Bsymbolic';
} }
last; last;
} }
} }
} }
if ($^O eq 'solaris' && $Config{gccversion}) {
push @CCFLAGS, "-std=gnu99";
}
my %CC_OPTIONS = (
INC => join( ' ', @CC_INC ),
DEFINE => join( ' ', @CC_DEFINE ),
);
$CC_OPTIONS{LIBS} = join ' ', @CC_LIBS if @CC_LIBS;
$CC_OPTIONS{CCFLAGS} = join ' ', $Config{ccflags}, @CCFLAGS if @CCFLAGS;
$CC_OPTIONS{LDFLAGS} = join ' ', $Config{ldflags}, @LDFLAGS if @LDFLAGS;
$CC_OPTIONS{LDDLFLAGS} = join ' ', $Config{lddlflags}, @LDDLFLAGS if @LDDLFLAGS;
@ -308,11 +314,7 @@ WriteMakefile(
# this change broke a test under some environment, and thus, may # this change broke a test under some environment, and thus, may
# break other applications eventually. I'm not sure if this is # break other applications eventually. I'm not sure if this is
# worth the trouble. # worth the trouble.
OPTIMIZE => $Config{optimize} . ( OPTIMIZE => $Config{optimize} . ($^O eq 'solaris' && !$Config{gccversion} ? "" : " -O2"),
($^O eq 'solaris')
? (!$Config{gccversion} ? "" : " -O2 -std=gnu99")
: " -O2"
),
OPTIONAL( '6.48', OPTIONAL( '6.48',
MIN_PERL_VERSION => '5.006', MIN_PERL_VERSION => '5.006',
), ),
@ -367,7 +369,7 @@ WriteMakefile(
PL_FILES => {}, PL_FILES => {},
EXE_FILES => [], EXE_FILES => [],
@CC_OPTIONS, %CC_OPTIONS,
); );
package MY; package MY;