From 045b2809f8e904ef520b828198ab5c953ce70f60 Mon Sep 17 00:00:00 2001 From: "Dr. Stephen Henson" Date: Mon, 8 Apr 2013 14:53:54 +0100 Subject: [PATCH] Asm build portability. Don't use Win32 specific options in mk1mf.pl to build assembly language files. --- util/mk1mf.pl | 8 ++++---- util/pl/unix.pl | 1 + 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/util/mk1mf.pl b/util/mk1mf.pl index ab806d1d2..2b383e233 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 1e0902a68..72d3b441e 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