generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Inherit CFLAGS when plaform is "auto".

Browse Source
This commit is contained in:
Ben Laurie 2013-02-27 22:07:26 +00:00
parent ea5003bd1e
commit 3c76bcded0
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
util/mk1mf.pl
View File

@ -196,6 +196,7 @@ $NT=0;
push(@INC,"util/pl","pl"); push(@INC,"util/pl","pl");
if ($platform eq "auto") { if ($platform eq "auto") {
$orig_platform = $platform;
$platform = $mf_platform; $platform = $mf_platform;
print STDERR "Imported platform $mf_platform\n"; print STDERR "Imported platform $mf_platform\n";
} }
@ -321,6 +322,9 @@ else
##else ##else
{ $cflags="$c_flags$cflags" if ($c_flags ne ""); } { $cflags="$c_flags$cflags" if ($c_flags ne ""); }
print STDERR "platform = $orig_platform\n";
$cflags = $mf_cflag if $orig_platform eq 'auto';
$ex_libs="$l_flags$ex_libs" if ($l_flags ne ""); $ex_libs="$l_flags$ex_libs" if ($l_flags ne "");
@ -1245,7 +1249,8 @@ sub cc_compile_target
$ex_flags.=" -DMK1MF_BUILD -D$platform_cpp_symbol" if ($source =~ /cversion/); $ex_flags.=" -DMK1MF_BUILD -D$platform_cpp_symbol" if ($source =~ /cversion/);
$target =~ s/\//$o/g if $o ne "/"; $target =~ s/\//$o/g if $o ne "/";
$source =~ s/\//$o/g if $o ne "/"; $source =~ s/\//$o/g if $o ne "/";
$ret ="$target: \$(SRC_D)$o$source\n\t"; # FIXME: do dependencies instead of all headers.
$ret ="$target: \$(SRC_D)$o$source \$(HEADER) \$(EXHEADER)\n\t";
$ret.="\$(CC) ${ofile}$target $ex_flags -c \$(SRC_D)$o$source\n\n"; $ret.="\$(CC) ${ofile}$target $ex_flags -c \$(SRC_D)$o$source\n\n";
return($ret); return($ret);
} }