From d510f25e2be030115c39cb3a0bec349647bca033 Mon Sep 17 00:00:00 2001
From: Michael Wu <mwu@mozilla.com>
Date: Sat, 19 May 2012 17:02:34 -0400
Subject: [PATCH] Bug 756746 - Quote paths in linker scripts, r=glandium
---
config/expandlibs_exec.py | 2 +-
config/tests/unit-expandlibs.py | 2 +-
js/src/config/expandlibs_exec.py | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/config/expandlibs_exec.py b/config/expandlibs_exec.py
index afc0fc8fd60d5..50e338bdbcdad 100644
--- a/config/expandlibs_exec.py
+++ b/config/expandlibs_exec.py
@@ -125,7 +125,7 @@ class ExpandArgsMore(ExpandArgs):
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
index f7154c67fc539..a96b38547a483 100644
--- a/config/tests/unit-expandlibs.py
+++ b/config/tests/unit-expandlibs.py
@@ -237,7 +237,7 @@ class TestExpandArgsMore(TestExpandInit):
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
index afc0fc8fd60d5..50e338bdbcdad 100644
--- a/js/src/config/expandlibs_exec.py
+++ b/js/src/config/expandlibs_exec.py
@@ -125,7 +125,7 @@ class ExpandArgsMore(ExpandArgs):
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]
--
GitLab