From: wolfgang <unknown>
Date: Fri, 30 May 2003 22:29:41 +0000 (+0000)
Subject: [project @ 2003-05-30 22:29:41 by wolfgang]
X-Git-Tag: Approx_11550_changesets_converted~832
X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=commitdiff_plain;h=44ff838446af62da8d941dba6390e2a5a935f715

[project @ 2003-05-30 22:29:41 by wolfgang]
MacOS X:
pass the -framework option and its parameter as two separate arguments,
i.e. ["-framework", "Foo"] instead of ["-framework Foo"].
This is necessary because all options passed to gcc are now quoted
(since rev. 1.88 of SysTools.lhs), and "-framework Foo" is not a valid
option (while "-framework" "Foo" is).

MERGE TO STABLE
---

diff --git a/ghc/compiler/main/DriverPipeline.hs b/ghc/compiler/main/DriverPipeline.hs
index 5dd7188..2482aaa 100644
--- a/ghc/compiler/main/DriverPipeline.hs
+++ b/ghc/compiler/main/DriverPipeline.hs
@@ -1156,10 +1156,10 @@ staticLink o_files dep_packages = do
     let framework_path_opts = map ("-F"++) framework_paths
 
     pkg_frameworks <- getPackageFrameworks dep_packages
-    let pkg_framework_opts = map ("-framework " ++) pkg_frameworks
+    let pkg_framework_opts = concat [ ["-framework", fw] | fw <- pkg_frameworks ]
 
     frameworks <- readIORef v_Cmdline_frameworks
-    let framework_opts = map ("-framework "++) (reverse frameworks)
+    let framework_opts = concat [ ["-framework", fw] | fw <- reverse frameworks ]
 	 -- reverse because they're added in reverse order from the cmd line
 #endif