Revert "Allow build-type Configure to work with Components"

This reverts commit 07f4dd5.

Author: angerman

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

@@ -300,7 +300,6 @@ configureSetupScript
       , useDependenciesExclusive = not defaultSetupDeps && isJust explicitSetupDeps
       , useVersionMacros = not defaultSetupDeps && isJust explicitSetupDeps
       , isInteractive = False
-      , isComponent = False
       }
     where
       -- When we are compiling a legacy setup script without an explicit

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

@@ -1833,10 +1833,7 @@ elaborateInstallPlan
               -- Once you've implemented this, swap it for the code below.
               cuz_buildtype =
                 case bt of
-                  PD.Configure -> []
-                  -- Configure is supported, but we only support configuring the
-                  -- main library in cabal. Other components will need to depend
-                  -- on the main library for configured data.
+                  PD.Configure -> [CuzBuildType CuzConfigureBuildType]
                   PD.Custom -> [CuzBuildType CuzCustomBuildType]
                   PD.Hooks -> [CuzBuildType CuzHooksBuildType]
                   PD.Make -> [CuzBuildType CuzMakeBuildType]
@@ -4031,9 +4028,6 @@ setupHsScriptOptions
       , forceExternalSetupMethod = isParallelBuild
       , setupCacheLock = Just cacheLock
       , isInteractive = False
-      , isComponent = case elabPkgOrComp of
-          ElabPackage{} -> False
-          ElabComponent{} -> True
       }
 
 -- | To be used for the input for elaborateInstallPlan.

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

@@ -314,12 +314,6 @@ data SetupScriptOptions = SetupScriptOptions
   -- ^ Is the task we are going to run an interactive foreground task,
   -- or an non-interactive background task? Based on this flag we
   -- decide whether or not to delegate ctrl+c to the spawned task
-  , isComponent :: Bool
-  -- ^ Let the setup script logic know if it is being run to build a component
-  -- or a package.  This is used to determine if we should use the configure
-  -- command, if the build-type is 'Configure'.  For configure, only the
-  -- main library has 'configure' support, and thus we can skip running
-  -- configure for components.
   }
 
 defaultSetupScriptOptions :: SetupScriptOptions
@@ -344,7 +338,6 @@ defaultSetupScriptOptions =
     , forceExternalSetupMethod = False
     , setupCacheLock = Nothing
     , isInteractive = False
-    , isComponent = False
     }
 
 workingDir :: SetupScriptOptions -> FilePath
@@ -381,9 +374,7 @@ getSetup verbosity options mpkg = do
                 (useCabalVersion options)
                 (orLaterVersion (mkVersion (cabalSpecMinimumLibraryVersion (specVersion pkg))))
           }
-      buildType' = case (buildType pkg, isComponent options) of
-        (Configure, True) -> Simple
-        (bt, _) -> bt
+      buildType' = buildType pkg
   (version, method, options'') <-
     getSetupMethod verbosity options' pkg buildType'
   return