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

Use "copy" instead of "auto".

Browse Source
This commit is contained in:
Ben Laurie 2013-03-02 04:44:36 +00:00
parent afc1b1eab7
commit d0aeeee176
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
util/mk1mf.pl
View File

@ -107,7 +107,8 @@ $infile="MINFO";
"netware-libc", "CodeWarrior for NetWare - LibC - with WinSock Sockets", "netware-libc", "CodeWarrior for NetWare - LibC - with WinSock Sockets",
"netware-libc-bsdsock", "CodeWarrior for NetWare - LibC - with BSD Sockets", "netware-libc-bsdsock", "CodeWarrior for NetWare - LibC - with BSD Sockets",
"default","cc under unix", "default","cc under unix",
"auto", "auto detect from top level Makefile" "auto", "auto detect from top level Makefile",
"copy", "copy from top level Makefile"
); );
$platform=""; $platform="";
@ -196,7 +197,7 @@ $NT=0;
push(@INC,"util/pl","pl"); push(@INC,"util/pl","pl");
if ($platform eq "auto") { if ($platform eq "auto" || $platform eq 'copy') {
$orig_platform = $platform; $orig_platform = $platform;
$platform = $mf_platform; $platform = $mf_platform;
print STDERR "Imported platform $mf_platform\n"; print STDERR "Imported platform $mf_platform\n";
@ -323,8 +324,10 @@ else
##else ##else
{ $cflags="$c_flags$cflags" if ($c_flags ne ""); } { $cflags="$c_flags$cflags" if ($c_flags ne ""); }
$cflags = $mf_cflag if $orig_platform eq 'auto'; if ($orig_platform eq 'copy') {
$cc = $mf_cc if $orig_platform eq 'auto'; $cflags = $mf_cflag;
$cc = $mf_cc;
}
$ex_libs="$l_flags$ex_libs" if ($l_flags ne ""); $ex_libs="$l_flags$ex_libs" if ($l_flags ne "");