From b1b374764fa6040681480e7746505c32e13ab5e7 Mon Sep 17 00:00:00 2001
From: Daniel Gröber <dxld@darkboxed.org>
Date: Sat, 11 Apr 2015 20:10:29 +0200
Subject: Add language options query

---
 CabalHelper/Main.hs | 23 ++++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

(limited to 'CabalHelper/Main.hs')

diff --git a/CabalHelper/Main.hs b/CabalHelper/Main.hs
index ef3447b..a09a634 100644
--- a/CabalHelper/Main.hs
+++ b/CabalHelper/Main.hs
@@ -92,6 +92,7 @@ usage = do
      ++"         | ghc-options     [--with-inplace]\n"
      ++"         | ghc-src-options [--with-inplace]\n"
      ++"         | ghc-pkg-options [--with-inplace]\n"
+     ++"         | ghc-lang-options [--with-inplace]\n"
      ++"         | entrypoints\n"
      ++"         | source-dirs\n"
      ++"         ) ...\n"
@@ -103,6 +104,7 @@ commands = [ "print-bli"
            , "ghc-options"
            , "ghc-src-options"
            , "ghc-pkg-options"
+           , "ghc-lang-options"
            , "entrypoints"
            , "source-dirs"]
 
@@ -178,7 +180,7 @@ main = do
 
            opts' = mempty {
                -- Not really needed but "unexpected package db stack: []"
-               ghcOptPackageDBs      = [GlobalPackageDB],
+               ghcOptPackageDBs      = [GlobalPackageDB, UserPackageDB],
 
                ghcOptCppOptions      = ghcOptCppOptions opts,
                ghcOptCppIncludePath  = ghcOptCppIncludePath opts,
@@ -207,6 +209,25 @@ main = do
          in renderGhcOptions' lbi v $ opts' `mappend` adopts
       return $ Just $ ChResponseStrings (res ++ [(ChSetupHsName, [])])
 
+    "ghc-lang-options":flags -> do
+      res <- componentsMap lbi v distdir $ \c clbi bi -> let
+           comp = compiler lbi
+           outdir = componentOutDir lbi c
+           (clbi', adopts) = case flags of
+                               ["--with-inplace"] -> (clbi, mempty)
+                               [] -> removeInplaceDeps v lbi pd clbi
+           opts = componentGhcOptions v lbi bi clbi' outdir
+
+           opts' = mempty {
+                       ghcOptPackageDBs      = [GlobalPackageDB, UserPackageDB],
+
+                       ghcOptLanguage = ghcOptLanguage opts,
+                       ghcOptExtensions = ghcOptExtensions opts,
+                       ghcOptExtensionMap = ghcOptExtensionMap opts
+                   }
+         in renderGhcOptions' lbi v $ opts' `mappend` adopts
+      return $ Just $ ChResponseStrings (res ++ [(ChSetupHsName, [])])
+
     "entrypoints":[] -> do
       eps <- componentsMap lbi v distdir $ \c clbi bi ->
                return $ componentEntrypoints c
-- 
cgit v1.2.3