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

* Android: Quote a path to crt object files if needed. It fixes linking when a library path contains spaces.

git-svn-id: trunk@23607 -
yury 12 жил өмнө
parent
commit
92b2ef2059

+ 2 - 2
compiler/systems/t_android.pas

@@ -228,7 +228,7 @@ begin
         else
         else
           s:='crtbegin_dynamic.o';
           s:='crtbegin_dynamic.o';
       librarysearchpath.FindFile(s,false,s1);
       librarysearchpath.FindFile(s,false,s1);
-      AddFileName(s1);
+      AddFileName(maybequoted(s1));
       { main objectfiles }
       { main objectfiles }
       while not ObjectFiles.Empty do
       while not ObjectFiles.Empty do
        begin
        begin
@@ -297,7 +297,7 @@ begin
       else
       else
         s:='crtend_android.o';
         s:='crtend_android.o';
       librarysearchpath.FindFile(s,false,s1);
       librarysearchpath.FindFile(s,false,s1);
-      AddFileName(s1);
+      AddFileName(maybequoted(s1));
       Add(')');
       Add(')');
 
 
       { Additions to the linker script }
       { Additions to the linker script }