diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2013-04-08 14:53:54 +0100 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2013-04-08 14:53:54 +0100 |
| commit | 045b2809f8e904ef520b828198ab5c953ce70f60 (patch) | |
| tree | 57caaf48aefb84634c93f6ef8854020042226327 /util | |
| parent | 29d422e2a08714ffd344badf1dd9ea7b64689065 (diff) | |
Asm build portability.
Don't use Win32 specific options in mk1mf.pl to build assembly language
files.
Diffstat (limited to 'util')
| -rwxr-xr-x | util/mk1mf.pl | 8 | ||||
| -rw-r--r-- | util/pl/unix.pl | 1 |
2 files changed, 5 insertions, 4 deletions
diff --git a/util/mk1mf.pl b/util/mk1mf.pl index ab806d1d23..2b383e2339 100755 --- a/util/mk1mf.pl +++ b/util/mk1mf.pl @@ -1269,15 +1269,15 @@ sub perlasm_compile_target my($ret); $bname =~ s/(.*)\.[^\.]$/$1/; - $ret ="\$(TMP_D)$o$bname.asm: $source\n"; + $ret ="\$(TMP_D)$o$bname$asm_suffix: $source\n"; $ret.="\t\$(PERL) $source $asmtype \$(CFLAG) >\$\@\n"; if ($fipscanisteronly) { - $ret .= "\t\$(PERL) util\\fipsas.pl . \$@ norunasm \$(CFLAG)\n"; + $ret .= "\t\$(PERL) util$o.pl . \$@ norunasm \$(CFLAG)\n"; } $ret .= "\n"; - $ret.="$target: \$(TMP_D)$o$bname.asm\n"; - $ret.="\t\$(ASM) $afile\$\@ \$(TMP_D)$o$bname.asm\n\n"; + $ret.="$target: \$(TMP_D)$o$bname$asm_suffix\n"; + $ret.="\t\$(ASM) $afile\$\@ \$(TMP_D)$o$bname$asm_suffix\n\n"; return($ret); } diff --git a/util/pl/unix.pl b/util/pl/unix.pl index 1e0902a68a..72d3b441e1 100644 --- a/util/pl/unix.pl +++ b/util/pl/unix.pl @@ -26,6 +26,7 @@ else { $cflags="-O"; } } $obj='.o'; +$asm_suffix='.s'; $ofile='-o '; # EXE linking stuff |