[commit: ghc] master: Quote file paths in linker scripts (0e40c01)
git at git.haskell.org
git at git.haskell.org
Sat Nov 7 23:54:34 UTC 2015
Repository : ssh://git@git.haskell.org/ghc
On branch : master
Link : http://ghc.haskell.org/trac/ghc/changeset/0e40c01db99680902fda4b7a84d7f15a92502730/ghc
>---------------------------------------------------------------
commit 0e40c01db99680902fda4b7a84d7f15a92502730
Author: Ben Gamari <ben at smart-cactus.org>
Date: Sun Nov 8 00:21:19 2015 +0100
Quote file paths in linker scripts
Reviewers: bgamari, austin
Reviewed By: austin
Subscribers: thomie
Differential Revision: https://phabricator.haskell.org/D1442
GHC Trac Issues: #11063
>---------------------------------------------------------------
0e40c01db99680902fda4b7a84d7f15a92502730
compiler/main/DriverPipeline.hs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/compiler/main/DriverPipeline.hs b/compiler/main/DriverPipeline.hs
index 60897a3..3a027c2 100644
--- a/compiler/main/DriverPipeline.hs
+++ b/compiler/main/DriverPipeline.hs
@@ -2191,7 +2191,7 @@ joinObjectFiles dflags o_files output_fn = do
then do
script <- newTempName dflags "ldscript"
cwd <- getCurrentDirectory
- let o_files_abs = map (cwd </>) o_files
+ let o_files_abs = map (\x -> "\"" ++ (cwd </> x) ++ "\"") o_files
writeFile script $ "INPUT(" ++ unwords o_files_abs ++ ")"
ld_r [SysTools.FileOption "" script] ccInfo
else if sLdSupportsFilelist mySettings
More information about the ghc-commits
mailing list