Permalink
Browse files

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

  • Loading branch information...
1 parent e70492a commit 6eddff83dd319af1eda1c4471af803e24c130a31 @michaelwu michaelwu committed May 19, 2012
Showing with 3 additions and 3 deletions.
  1. +1 −1 config/expandlibs_exec.py
  2. +1 −1 config/tests/unit-expandlibs.py
  3. +1 −1 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]
@@ -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":
@@ -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]

0 comments on commit 6eddff8

Please sign in to comment.