Commit 3cb28d18 authored by Richard Levitte's avatar Richard Levitte
Browse files

mk1mf: dtlstest needs ssltestlib, include it with a hack 



We don't really have a mechanism to include other object files into a given
test program.  For now, a simple hack in mk1mf.pl will do.

RT#4653

Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
parent 01f879d3

util/mk1mf.pl

+3 −2
Original line number Diff line number Diff line
@@ -692,8 +692,8 @@ $rules.=&do_copy_rule("\$(INCL_D)",$header,""); 
$defs.=&do_defs("EXHEADER",$exheader,"\$(INCO_D)","");

$rules.=&do_copy_rule("\$(INCO_D)",$exheader,"");



$defs.=&do_defs("T_OBJ",$test,"\$(OBJ_D)",$obj);

$rules.=&do_compile_rule("\$(OBJ_D)",$test,"\$(APP_CFLAGS)");

$defs.=&do_defs("T_OBJ","$test test${o}ssltestlib","\$(OBJ_D)",$obj);

$rules.=&do_compile_rule("\$(OBJ_D)","$test test${o}ssltestlib","\$(APP_CFLAGS)");



$defs.=&do_defs("E_OBJ",$e_exe,"\$(OBJ_D)",$obj);

$rules.=&do_compile_rule("\$(OBJ_D)",$e_exe,'-DMONOLITH $(APP_CFLAGS)');
@@ -764,6 +764,7 @@ foreach (split(/\s+/,$test)) 
	{

	$t=&bname($_);

	$tt="\$(OBJ_D)${o}$t${obj}";

	$tt.=" \$(OBJ_D)${o}ssltestlib${obj}" if $t eq "dtlstest";

	$rules.=&do_link_rule("\$(TEST_D)$o$t$exep",$tt,"\$(LIBS_DEP)","\$(L_LIBS) \$(EX_LIBS)");

	}