mirror of
https://gitlab.com/freepascal.org/fpc/source.git
synced 2025-08-15 05:29:30 +02:00
* fixed staticlib filename and unitlink instead of otherlinky
This commit is contained in:
parent
3df81628bc
commit
f7d25647af
@ -275,17 +275,13 @@ procedure timportlibos2.preparelib(const s:string);
|
|||||||
const armag='!<arch>'#10;
|
const armag='!<arch>'#10;
|
||||||
ar_magic:array[1..length(armag)] of char=armag;}
|
ar_magic:array[1..length(armag)] of char=armag;}
|
||||||
const ar_magic:array[1..8] of char='!<arch>'#10;
|
const ar_magic:array[1..8] of char='!<arch>'#10;
|
||||||
|
var
|
||||||
|
libname : string;
|
||||||
begin
|
begin
|
||||||
|
libname:=FixFileName(s+'.ao2');
|
||||||
seq_no:=1;
|
seq_no:=1;
|
||||||
if not (cs_create_smart in aktmoduleswitches) then
|
current_module^.linkunitstaticlibs.insert(libname,link_allways);
|
||||||
{$IFDEF NEWST}
|
assign(out_file,current_module^.outputpath^+libname);
|
||||||
current_module^.linkotherstaticlibs.
|
|
||||||
insert(new(Plinkitem,init(s,link_allways)));
|
|
||||||
{$ELSE}
|
|
||||||
current_module^.linkotherstaticlibs.insert(s,link_allways);
|
|
||||||
{$ENDIF NEWST}
|
|
||||||
assign(out_file,current_module^.outputpath^+s+'.ao2');
|
|
||||||
rewrite(out_file,1);
|
rewrite(out_file,1);
|
||||||
blockwrite(out_file,ar_magic,sizeof(ar_magic));
|
blockwrite(out_file,ar_magic,sizeof(ar_magic));
|
||||||
end;
|
end;
|
||||||
@ -507,7 +503,10 @@ end;
|
|||||||
end.
|
end.
|
||||||
{
|
{
|
||||||
$Log$
|
$Log$
|
||||||
Revision 1.3 2000-08-27 16:11:54 peter
|
Revision 1.4 2000-09-20 19:38:34 peter
|
||||||
|
* fixed staticlib filename and unitlink instead of otherlinky
|
||||||
|
|
||||||
|
Revision 1.3 2000/08/27 16:11:54 peter
|
||||||
* moved some util functions from globals,cobjects to cutils
|
* moved some util functions from globals,cobjects to cutils
|
||||||
* splitted files into finput,fmodule
|
* splitted files into finput,fmodule
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user