Merge pull request #7917 from bacchanalia/master

Cabal/src/Distribution/PackageDescription/Check.hs

Cabal/src/Distribution/Simple/GHC.hs

Cabal/src/Distribution/Simple/GHCJS.hs

Cabal/src/Distribution/Simple/PreProcess.hs

Cabal/src/Distribution/Simple/Program/GHC.hs

cabal-install/src/Distribution/Client/ScriptUtils.hs

cabal-install/src/Distribution/Client/TargetSelector.hs

...testsuite/PackageTests/NewBuild/CmdBuild/Script/cabal.out

.../PackageTests/NewBuild/CmdBuild/ScriptBuildRepl/cabal.out

...e/PackageTests/NewBuild/CmdBuild/ScriptBuildRun/cabal.out

...uite/PackageTests/NewBuild/CmdBuild/ScriptRerun/cabal.out

...l-testsuite/PackageTests/NewBuild/CmdClean/Keep/cabal.out

...testsuite/PackageTests/NewBuild/CmdClean/Orphan/cabal.out

...testsuite/PackageTests/NewBuild/CmdClean/Script/cabal.out

...-testsuite/PackageTests/NewBuild/CmdRepl/Script/cabal.out

...suite/PackageTests/NewBuild/CmdRepl/ScriptRerun/cabal.out

...l-testsuite/PackageTests/NewBuild/CmdRun/Script/cabal.out

...ite/PackageTests/NewBuild/CmdRun/ScriptLiterate/cabal.out

.../PackageTests/NewBuild/CmdRun/ScriptNoExtention/cabal.out

...kageTests/NewBuild/CmdRun/ScriptNoExtention/cabal.test.hs