2
0
Эх сурвалжийг харах

* always surround ld link.res SEARCH_DIR() arguments with double quotes,
rather than with single/double quotes depending on the target platform
(ld only supports double quotes), and rather than only quoting when
necessary (wastes time since quotes are always allowed, and double
quotes inside a directory name cannot be escaped for ld; they are
simply not supported by the program) (mantis #22059, follow-up to
r21069 and r21208)

git-svn-id: trunk@21343 -

Jonas Maebe 13 жил өмнө
parent
commit
c27f9da1b2

+ 2 - 2
compiler/systems/t_aix.pas

@@ -163,7 +163,7 @@ begin
       while assigned(HPath) do
        begin
          if assumebinutils then
-           Add('SEARCH_DIR('+maybequoted(HPath.Str)+')')
+           Add('SEARCH_DIR("'+HPath.Str+'")')
          else
            Add('-L'+HPath.Str);
          HPath:=TCmdStrListItem(HPath.Next);
@@ -172,7 +172,7 @@ begin
       while assigned(HPath) do
        begin
          if assumebinutils then
-           Add('SEARCH_DIR('+maybequoted(HPath.Str)+')')
+           Add('SEARCH_DIR("'+HPath.Str+'")')
          else
            Add('-L'+HPath.Str);
          HPath:=TCmdStrListItem(HPath.Next);

+ 1 - 1
compiler/systems/t_amiga.pas

@@ -118,7 +118,7 @@ begin
    begin
     s:=HPath.Str;
     if s<>'' then
-     LinkRes.Add('SEARCH_DIR('+Unix2AmigaPath(maybequoted(s))+')');
+     LinkRes.Add('SEARCH_DIR("'+Unix2AmigaPath(s)+'")');
     HPath:=TCmdStrListItem(HPath.Next);
    end;
 

+ 2 - 2
compiler/systems/t_bsd.pas

@@ -424,7 +424,7 @@ begin
      if LdSupportsNoResponseFile then
        LinkRes.Add('-L'+HPath.Str)
      else
-       LinkRes.Add('SEARCH_DIR('+maybequoted(HPath.Str)+')');
+       LinkRes.Add('SEARCH_DIR("'+HPath.Str+'")');
      HPath:=TCmdStrListItem(HPath.Next);
    end;
   HPath:=TCmdStrListItem(LibrarySearchPath.First);
@@ -433,7 +433,7 @@ begin
      if LdSupportsNoResponseFile then
        LinkRes.Add('-L'+HPath.Str)
      else
-       LinkRes.Add('SEARCH_DIR('+maybequoted(HPath.Str)+')');
+       LinkRes.Add('SEARCH_DIR("'+HPath.Str+'")');
      HPath:=TCmdStrListItem(HPath.Next);
    end;
 

+ 1 - 1
compiler/systems/t_embed.pas

@@ -113,7 +113,7 @@ begin
    begin
     s:=HPath.Str;
     if s<>'' then
-     LinkRes.Add('SEARCH_DIR('+(maybequoted(s))+')');
+     LinkRes.Add('SEARCH_DIR("'+s+'")');
     HPath:=TCmdStrListItem(HPath.Next);
    end;
 

+ 1 - 1
compiler/systems/t_gba.pas

@@ -107,7 +107,7 @@ begin
    begin
     s:=HPath.Str;
     if s<>'' then
-     LinkRes.Add('SEARCH_DIR('+(maybequoted(s))+')');
+     LinkRes.Add('SEARCH_DIR("'+s+'")');
     HPath:=TCmdStrListItem(HPath.Next);
    end;
 

+ 2 - 2
compiler/systems/t_linux.pas

@@ -353,13 +353,13 @@ begin
       HPath:=TCmdStrListItem(current_module.locallibrarysearchpath.First);
       while assigned(HPath) do
        begin
-         Add('SEARCH_DIR('+maybequoted(HPath.Str)+')');
+         Add('SEARCH_DIR("'+HPath.Str+'")');
          HPath:=TCmdStrListItem(HPath.Next);
        end;
       HPath:=TCmdStrListItem(LibrarySearchPath.First);
       while assigned(HPath) do
        begin
-         Add('SEARCH_DIR('+maybequoted(HPath.Str)+')');
+         Add('SEARCH_DIR("'+HPath.Str+'")');
          HPath:=TCmdStrListItem(HPath.Next);
        end;
 

+ 1 - 1
compiler/systems/t_morph.pas

@@ -104,7 +104,7 @@ begin
    begin
     s:=HPath.Str;
     if s<>'' then
-     LinkRes.Add('SEARCH_DIR('+Unix2AmigaPath(maybequoted(s))+')');
+     LinkRes.Add('SEARCH_DIR("'+Unix2AmigaPath(s)+'")');
     HPath:=TCmdStrListItem(HPath.Next);
    end;
 

+ 1 - 1
compiler/systems/t_nds.pas

@@ -122,7 +122,7 @@ begin
    begin
     s:=HPath.Str;
     if s<>'' then
-     LinkRes.Add('SEARCH_DIR('+(maybequoted(s))+')');
+     LinkRes.Add('SEARCH_DIR("'+s+'")');
     HPath:=TCmdStrListItem(HPath.Next);
    end;
 

+ 2 - 2
compiler/systems/t_sunos.pas

@@ -224,13 +224,13 @@ begin
   HPath:=TCmdStrListItem(current_module.locallibrarysearchpath.First);
   while assigned(HPath) do
    begin
-     LinkRes.Add('SEARCH_DIR('+maybequoted(HPath.Str)+')');
+     LinkRes.Add('SEARCH_DIR("'+HPath.Str+'")');
      HPath:=TCmdStrListItem(HPath.Next);
    end;
   HPath:=TCmdStrListItem(LibrarySearchPath.First);
   while assigned(HPath) do
    begin
-     LinkRes.Add('SEARCH_DIR('+maybequoted(HPath.Str)+')');
+     LinkRes.Add('SEARCH_DIR("'+HPath.Str+'")');
      HPath:=TCmdStrListItem(HPath.Next);
    end;
 

+ 1 - 1
compiler/systems/t_wii.pas

@@ -99,7 +99,7 @@ begin
    begin
     s:=HPath.Str;
     if s<>'' then
-     LinkRes.Add('SEARCH_DIR('+(maybequoted(s))+')');
+     LinkRes.Add('SEARCH_DIR("'+s+'")');
     HPath:=TCmdStrListItem(HPath.Next);
    end;
 

+ 2 - 2
compiler/systems/t_win.pas

@@ -1200,13 +1200,13 @@ implementation
             HPath:=TCmdStrListItem(current_module.locallibrarysearchpath.First);
             while assigned(HPath) do
              begin
-               Add('SEARCH_DIR('+MaybeQuoted(HPath.Str)+')');
+               Add('SEARCH_DIR("'+HPath.Str+'")');
                HPath:=TCmdStrListItem(HPath.Next);
              end;
             HPath:=TCmdStrListItem(LibrarySearchPath.First);
             while assigned(HPath) do
              begin
-               Add('SEARCH_DIR('+MaybeQuoted(HPath.Str)+')');
+               Add('SEARCH_DIR("'+HPath.Str+'")');
                HPath:=TCmdStrListItem(HPath.Next);
              end;