Pass the right -F and --framework flags when running hsc2hs on OS X

haskell · Jul 29, 2008 · 8a4b73c · 8a4b73c
1 parent 609c67b
commit 8a4b73c
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/Distribution/Simple/PreProcess.hs b/Distribution/Simple/PreProcess.hs
@@ -352,12 +352,14 @@ ppHsc2hs bi lbi = standardPP lbi hsc2hsProgram $
     , "--ld=" ++ programPath gccProg ]
 
     -- OSX frameworks:
- ++ [ "--cflag=-F" ++ opt
+ ++ [ what ++ "=-F" ++ opt
     | isOSX
-    , opt <- nub (concatMap Installed.frameworkDirs pkgs) ]
- ++ [ "--cflag=-framework" ++ opt
+    , opt <- nub (concatMap Installed.frameworkDirs pkgs)
+    , what <- ["--cflag", "--lflag"] ]
+ ++ [ "--lflag=" ++ arg
     | isOSX
-    , opt <- PD.frameworks bi ++ concatMap Installed.frameworks pkgs ]
+    , opt <- PD.frameworks bi ++ concatMap Installed.frameworks pkgs
+    , arg <- ["-framework", opt] ]
 
     -- Options from the current package:
  ++ [ "--cflag="   ++ opt | opt <- hcDefines (compiler lbi) ]