diff options
| author | Richard Levitte <levitte@openssl.org> | 2016-08-19 16:53:54 +0200 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2016-08-23 00:09:40 +0200 |
| commit | 3cb28d188803c7768f767f0da40bbea61449521c (patch) | |
| tree | ff587f7bb27049c312f366f9614fa9f09c14fe8a /util | |
| parent | 01f879d3e3fe5bdcf290b802a3c44a2bdde2b059 (diff) | |
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: Rich Salz <rsalz@openssl.org>
Diffstat (limited to 'util')
| -rwxr-xr-x | util/mk1mf.pl | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/util/mk1mf.pl b/util/mk1mf.pl index 128a405efc..4eded5aafe 100755 --- a/util/mk1mf.pl +++ b/util/mk1mf.pl @@ -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)"); } |