From: wolfgang <unknown>
Date: Mon, 28 Mar 2005 22:03:33 +0000 (+0000)
Subject: [project @ 2005-03-28 22:03:33 by wolfgang]
X-Git-Tag: Initial_conversion_from_CVS_complete~858
X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=commitdiff_plain;h=70960d2ef24add2911e5613ca25cf1d226b2e082

[project @ 2005-03-28 22:03:33 by wolfgang]
Track recent dynamic flags changes; fixes the build for Mac OS X.
---

diff --git a/ghc/compiler/ghci/Linker.lhs b/ghc/compiler/ghci/Linker.lhs
index 4ee87cd..4ebbc8b 100644
--- a/ghc/compiler/ghci/Linker.lhs
+++ b/ghc/compiler/ghci/Linker.lhs
@@ -215,8 +215,8 @@ reallyInitDynLinker dflags
 
 	   	-- (e) Link any MacOS frameworks
 #ifdef darwin_TARGET_OS	
-	; framework_paths <- readIORef v_Framework_paths
-	; frameworks      <- readIORef v_Cmdline_frameworks
+	; let framework_paths = frameworkPaths dflags
+	; let frameworks      = cmdlineFrameworks dflags
 #else
 	; let frameworks      = []
 	; let framework_paths = []
diff --git a/ghc/compiler/main/DriverPipeline.hs b/ghc/compiler/main/DriverPipeline.hs
index a4bf3cc..c6d7a4d 100644
--- a/ghc/compiler/main/DriverPipeline.hs
+++ b/ghc/compiler/main/DriverPipeline.hs
@@ -1082,13 +1082,14 @@ staticLink dflags o_files dep_packages = do
     pkg_framework_paths <- getPackageFrameworkPath dflags dep_packages
     let pkg_framework_path_opts = map ("-F"++) pkg_framework_paths
 
-    framework_paths <- readIORef v_Framework_paths
-    let framework_path_opts = map ("-F"++) framework_paths
+    let framework_paths = frameworkPaths dflags
+        framework_path_opts = map ("-F"++) framework_paths
 
     pkg_frameworks <- getPackageFrameworks dflags dep_packages
     let pkg_framework_opts = concat [ ["-framework", fw] | fw <- pkg_frameworks ]
-    frameworks <- readIORef v_Cmdline_frameworks
-    let framework_opts = concat [ ["-framework", fw] | fw <- reverse frameworks ]
+    
+    let frameworks = cmdlineFrameworks dflags
+        framework_opts = concat [ ["-framework", fw] | fw <- reverse frameworks ]
 	 -- reverse because they're added in reverse order from the cmd line
 #endif