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

User cleaner way to handle new options for VC++ build.

Browse Source
This commit is contained in:
Dr. Stephen Henson
2007-01-19 13:17:52 +00:00
parent 83a3805771
commit af094ed124
1 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
util/mk1mf.pl
View File

@@ -365,7 +365,6 @@ for (;;)
if ($key eq "FIPS_EX_OBJ") if ($key eq "FIPS_EX_OBJ")
{ {
$val =~ s|\.\./crypto/||g;
$fips_ex_obj=&var_add("crypto",$val); $fips_ex_obj=&var_add("crypto",$val);
} }
@@ -389,7 +388,7 @@ if ($fips)
$fips_exclude_obj{$1} = 1 if (/\/([^\/]*)$/); $fips_exclude_obj{$1} = 1 if (/\/([^\/]*)$/);
} }
# $fips_exclude_obj{"bn_asm"} = 1; $fips_exclude_obj{"bn_asm"} = 1;
my @ltmp = split " ", $lib_obj{"CRYPTO"}; my @ltmp = split " ", $lib_obj{"CRYPTO"};
@@ -398,21 +397,19 @@ if ($fips)
foreach(@ltmp) foreach(@ltmp)
{ {
if (/\/bn_asm$/) if (/\/([^\/]*)$/ && exists $fips_exclude_obj{$1})
{ {
$lib_obj{"FIPS"} .= "$_ "; if ($fipscanisterbuild)
{
$lib_obj{"FIPS"} .= "$_ ";
}
} }
elsif (!/\/([^\/]*)$/ || !exists $fips_exclude_obj{$1}) else
{ {
$lib_obj{"CRYPTO"} .= "$_ "; $lib_obj{"CRYPTO"} .= "$_ ";
} }
} }
if ($fipscanisterbuild)
{
$lib_obj{"FIPS"} .= $fips_ex_obj;
}
} }
if ($fipscanisterbuild) if ($fipscanisterbuild)