|
@@ -426,13 +426,13 @@ begin
|
|
{ Write staticlibraries }
|
|
{ Write staticlibraries }
|
|
if not StaticLibFiles.Empty then
|
|
if not StaticLibFiles.Empty then
|
|
begin
|
|
begin
|
|
- linkres.add('-(');
|
|
|
|
|
|
+ linkres.add('-(');
|
|
While not StaticLibFiles.Empty do
|
|
While not StaticLibFiles.Empty do
|
|
begin
|
|
begin
|
|
S:=StaticLibFiles.GetFirst;
|
|
S:=StaticLibFiles.GetFirst;
|
|
LinkRes.AddFileName(maybequoted(s))
|
|
LinkRes.AddFileName(maybequoted(s))
|
|
end;
|
|
end;
|
|
- linkres.add('-)');
|
|
|
|
|
|
+ linkres.add('-)');
|
|
end;
|
|
end;
|
|
|
|
|
|
{ Write sharedlibraries like -l<lib>, also add the needed dynamic linker
|
|
{ Write sharedlibraries like -l<lib>, also add the needed dynamic linker
|
|
@@ -494,6 +494,7 @@ var
|
|
StaticStr, RedirectStr,
|
|
StaticStr, RedirectStr,
|
|
StripStr : string[40];
|
|
StripStr : string[40];
|
|
begin
|
|
begin
|
|
|
|
+ success:=false;
|
|
if not(cs_link_nolink in current_settings.globalswitches) then
|
|
if not(cs_link_nolink in current_settings.globalswitches) then
|
|
Message1(exec_i_linking,current_module.exefilename);
|
|
Message1(exec_i_linking,current_module.exefilename);
|
|
|
|
|
|
@@ -604,6 +605,7 @@ var
|
|
cmdstr : TCmdStr;
|
|
cmdstr : TCmdStr;
|
|
need_quotes, success : boolean;
|
|
need_quotes, success : boolean;
|
|
begin
|
|
begin
|
|
|
|
+ success:=false;
|
|
MakeSharedLibrary:=false;
|
|
MakeSharedLibrary:=false;
|
|
if not(cs_link_nolink in current_settings.globalswitches) then
|
|
if not(cs_link_nolink in current_settings.globalswitches) then
|
|
Message1(exec_i_linking,current_module.sharedlibfilename);
|
|
Message1(exec_i_linking,current_module.sharedlibfilename);
|
|
@@ -627,7 +629,7 @@ begin
|
|
need_quotes:= (cs_link_nolink in current_settings.globalswitches) or
|
|
need_quotes:= (cs_link_nolink in current_settings.globalswitches) or
|
|
(RedirectStr<>'');
|
|
(RedirectStr<>'');
|
|
{ initname and fininame may contain $, which can be wrongly interpreted
|
|
{ initname and fininame may contain $, which can be wrongly interpreted
|
|
- in a link script, thus we surround them with single quotes
|
|
|
|
|
|
+ in a link script, thus we surround them with single quotes
|
|
in cs_link_nolink is in globalswitches }
|
|
in cs_link_nolink is in globalswitches }
|
|
if use_gnu_ld then
|
|
if use_gnu_ld then
|
|
begin
|
|
begin
|