diff --git a/Cabal/src/Distribution/Simple/GHC/Build.hs b/Cabal/src/Distribution/Simple/GHC/Build.hs index 47c6d4ead97..2aee12791c0 100644 --- a/Cabal/src/Distribution/Simple/GHC/Build.hs +++ b/Cabal/src/Distribution/Simple/GHC/Build.hs @@ -115,6 +115,7 @@ build numJobs pkg_descr = do <> [DynWay | wantDynamic] <> [ProfWay | wantProf] -- If no way is explicitly wanted, we take vanilla + -- ROMES:TODO: Drop vanilla altogether, use static as default. <> [VanillaWay | wantVanilla || not (wantStatic || wantDynamic || wantProf)] -- ROMES:TODO: Is vanilla necessarily the same as defaultGhcWay? If so, -- we can deal away with VanillaWay and be explicit in -dynamic vs diff --git a/Cabal/src/Distribution/Simple/GHC/Build/Link.hs b/Cabal/src/Distribution/Simple/GHC/Build/Link.hs index 65ba4ec9aa6..09c74cfef61 100644 --- a/Cabal/src/Distribution/Simple/GHC/Build/Link.hs +++ b/Cabal/src/Distribution/Simple/GHC/Build/Link.hs @@ -138,7 +138,6 @@ linkOrLoadComponent ghcProg pkg_descr extraSources (buildTargetDir, targetDir) ( { ghcOptMode = toFlag GhcModeInteractive , ghcOptOptimisation = toFlag GhcNoOptimisation } - print ("BUILDING REPLT BASE OPTS", vanillaOpts) -- TODO: problem here is we need the .c files built first, so we can load them -- with ghci, but .c files can depend on .h files generated by ghc by ffi