Asm build portability.

Don't use Win32 specific options in mk1mf.pl to build assembly language
files.

diff --git a/util/mk1mf.pl b/util/mk1mf.pl
index ab806d1d23b6f870125b6a0c8808817f08c89b03..2b383e2339937a6dd207d5e9e4e6882f07ceb6a4 100755 (executable)
--- a/util/mk1mf.pl
+++ b/util/mk1mf.pl
@@ -1269,15 +1269,15 @@ sub perlasm_compile_target
 
        my($ret);
        $bname =~ s/(.*)\.[^\.]$/$1/;
 
        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) $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 .= "\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);
        }
 
        return($ret);
        }
 

diff --git a/util/pl/unix.pl b/util/pl/unix.pl
index 1e0902a68a3415591c96d868382a33fde5259cfa..72d3b441e142cd83ad490931c2a28ce8a9099de5 100644 (file)
--- a/util/pl/unix.pl
+++ b/util/pl/unix.pl
@@ -26,6 +26,7 @@ else
                { $cflags="-O"; }
        }
 $obj='.o';
                { $cflags="-O"; }
        }
 $obj='.o';

+$asm_suffix='.s';

 $ofile='-o ';
 
 # EXE linking stuff
 $ofile='-o ';
 
 # EXE linking stuff