Commit 940a09ba authored by Richard Levitte's avatar Richard Levitte
Browse files

Minimize copied config settings 



$target{lflags} and $target{plib_flag} were copied to %config for no
good reason.

Reviewed-by: default avatarAndy Polyakov <appro@openssl.org>
parent 98fdbce0

Configurations/descrip.mms.tmpl

+1 −1
Original line number Diff line number Diff line
@@ -128,7 +128,7 @@ ENGINESDIR={- $osslprefix -}ENGINES: 
CC= {- $target{cc} -}

CFLAGS= /DEFINE=({- join(",", @{$config{defines}},"OPENSSLDIR=\"\"\"\$(OPENSSLDIR)\"\"\"","ENGINESDIR=\"\"\"\$(ENGINESDIR)\"\"\"") -}) {- $config{cflags} -}

DEPFLAG= /DEFINE=({- join(",", @{$config{depdefines}}) -})

LDFLAGS= {- $config{lflags} -}

LDFLAGS= {- $target{lflags} -}

EX_LIBS= {- $config{ex_libs} ? ",".$config{ex_libs} : "" -}



PERL={- $config{perl} -}

Configurations/unix-Makefile.tmpl

+2 −2
Original line number Diff line number Diff line
@@ -146,8 +146,8 @@ CROSS_COMPILE= {- $config{cross_compile_prefix} -} 
CC= $(CROSS_COMPILE){- $target{cc} -}

CFLAGS={- our $cflags2 = join(" ",(map { "-D".$_} @{$config{defines}}),"-DOPENSSLDIR=\"\\\"\$(OPENSSLDIR)\\\"\"","-DENGINESDIR=\"\\\"\$(ENGINESDIR)\\\"\"") -} {- $config{cflags} -}

CFLAGS_Q={- $cflags2 =~ s|([\\"])|\\$1|g; $cflags2 -} {- $config{cflags} -}

LDFLAGS= {- $config{lflags} -}

PLIB_LDFLAGS= {- $config{plib_lflags} -}

LDFLAGS= {- $target{lflags} -}

PLIB_LDFLAGS= {- $target{plib_lflags} -}

EX_LIBS= {- $config{ex_libs} -}

SHARED_CFLAGS={- $target{shared_cflag} || "" -}

SHARED_LDFLAGS={- $target{shared_ldflag}

Configure

+2 −8
Original line number Diff line number Diff line
@@ -871,12 +871,6 @@ $config{defines} = [ @{$target{defines}}, 
$config{cflags} = join(" ",

		       grep { $_ ne "" } ($target{cflags},

					  $target{$build_prefix."cflags"}));

$config{lflags} = join(" ",

		       grep { $_ ne "" } ($target{lflags},

					  $target{$build_prefix."lflags"}));

$config{plib_lflags} = join(" ",

			    grep { $_  ne "" } ($target{plib_lflags},

					        $target{$build_prefix."plib_lflags"}));

$config{ex_libs} = join(" ",

			grep { $_  ne "" } ($target{ex_libs},

					    $target{$build_prefix."ex_libs"}));
@@ -1682,8 +1676,8 @@ print "IsMK1MF =", ($builder eq "mk1mf" ? "yes" : "no"), "\n"; 
print "CC            =$target{cc}\n";

print "CFLAG         =$config{cflags}\n";

print "DEFINES       =",join(" ", @{$config{defines}}),"\n";

print "LFLAG         =$config{lflags}\n";

print "PLIB_LFLAG    =$config{plib_lflags}\n";

print "LFLAG         =$target{lflags}\n";

print "PLIB_LFLAG    =$target{plib_lflags}\n";

print "EX_LIBS       =$config{ex_libs}\n";

print "APPS_OBJ      =$target{apps_obj}\n";

print "CPUID_OBJ     =$target{cpuid_obj}\n";