Bug 756746 - Quote paths in linker scripts, r=glandium

sailfishos · May 19, 2012 · d510f25 · d510f25
1 parent 66c59c9
commit d510f25
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/config/expandlibs_exec.py b/config/expandlibs_exec.py
@@ -125,7 +125,7 @@ def makelist(self):
         if not len(objs): return
         fd, tmp = tempfile.mkstemp(suffix=".list",dir=os.curdir)
         if conf.EXPAND_LIBS_LIST_STYLE == "linkerscript":
-            content = ["INPUT(%s)\n" % obj for obj in objs]
+            content = ['INPUT("%s")\n' % obj for obj in objs]
             ref = tmp
         elif conf.EXPAND_LIBS_LIST_STYLE == "list":
             content = ["%s\n" % obj for obj in objs]

diff --git a/config/tests/unit-expandlibs.py b/config/tests/unit-expandlibs.py
@@ -237,7 +237,7 @@ def test_makelist(self):
             if config.EXPAND_LIBS_LIST_STYLE == "linkerscript":
                 self.assertNotEqual(args[3][0], '@')
                 filename = args[3]
-                content = ["INPUT(%s)" % relativize(f) for f in objs]
+                content = ['INPUT("%s")' % relativize(f) for f in objs]
                 with open(filename, 'r') as f:
                     self.assertEqual([l.strip() for l in f.readlines() if len(l.strip())], content)
             elif config.EXPAND_LIBS_LIST_STYLE == "list":

diff --git a/js/src/config/expandlibs_exec.py b/js/src/config/expandlibs_exec.py
@@ -125,7 +125,7 @@ def makelist(self):
         if not len(objs): return
         fd, tmp = tempfile.mkstemp(suffix=".list",dir=os.curdir)
         if conf.EXPAND_LIBS_LIST_STYLE == "linkerscript":
-            content = ["INPUT(%s)\n" % obj for obj in objs]
+            content = ['INPUT("%s")\n' % obj for obj in objs]
             ref = tmp
         elif conf.EXPAND_LIBS_LIST_STYLE == "list":
             content = ["%s\n" % obj for obj in objs]