Merge branch 'master' of github.com:haskell/cabal

Author: christiaanb

Cabal/Distribution/Simple/GHC.hs

@@ -809,7 +809,11 @@ buildOrReplLib forRepl verbosity numJobs pkg_descr lbi lib clbi = do
                                }
                odir          = fromFlag (ghcOptObjDir vanillaCcOpts)
            createDirectoryIfMissingVerbose verbosity True odir
-           runGhcProg vanillaCcOpts
+           runGhcProg (if isGhcDynamic
+                       -- Dynamic GHC requires C sources to be built with
+                       -- -fPIC for REPL to work. See #2207.
+                       then vanillaCcOpts { ghcOptFPic = toFlag True }
+                       else vanillaCcOpts)
            unless forRepl $
              whenSharedLib forceSharedLib (runGhcProg sharedCcOpts)
            unless forRepl $ whenProfLib (runGhcProg profCcOpts)

cabal-install/Distribution/Client/Setup.hs

@@ -1636,7 +1636,8 @@ sandboxCommand = CommandUI {
   commandUsage        = \pname ->
        "Usage: " ++ pname ++ " sandbox init\n"
     ++ "   or: " ++ pname ++ " sandbox delete\n"
-    ++ "   or: " ++ pname ++ " sandbox add-source  [PATHS]\n\n"
+    ++ "   or: " ++ pname ++ " sandbox add-source  [PATHS]\n"
+    ++ "   or: " ++ pname ++ " sandbox delete-source  [PATHS]\n\n"
     ++ "   or: " ++ pname ++ " sandbox hc-pkg      -- [ARGS]\n"
     ++ "   or: " ++ pname ++ " sandbox list-sources\n\n"
     ++ "Flags for sandbox:",

cabal-install/Main.hs

@@ -1052,13 +1052,14 @@ sandboxAction sandboxFlags extraArgs globalFlags = do
         sandboxHcPkg verbosity sandboxFlags globalFlags extra
     ["buildopts"] -> die "Not implemented!"
 
-    -- Hidden commands.
     ("delete-source":extra) -> do
         when (noExtraArgs extra) $
           die "The 'sandbox delete-source' command expects \
               \at least one argument"
         sandboxDeleteSource verbosity extra sandboxFlags globalFlags
     ["list-sources"] -> sandboxListSources verbosity sandboxFlags globalFlags
+
+    -- Hidden commands.
     ["dump-pkgenv"]  -> dumpPackageEnvironment verbosity sandboxFlags globalFlags
 
     -- Error handling.