Skip to content

Commit cc4c2ff

Browse files
committed
trivia
1 parent c54e542 commit cc4c2ff

File tree

1 file changed

+4
-5
lines changed
  • Cabal/src/Distribution/Simple/GHC/Build

1 file changed

+4
-5
lines changed

Cabal/src/Distribution/Simple/GHC/Build/Link.hs

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ linkOrLoadComponent
220220
get_rpaths ways =
221221
if DynWay `Set.member` ways then getRPaths pbci else return (toNubListR [])
222222
in
223-
when (not $ componentIsIndefinite clbi) $ do
223+
unless (componentIsIndefinite clbi) $ do
224224
-- If not building dynamically, we don't pass any runtime paths.
225225
liftIO $ do
226226
info verbosity "Linking..."
@@ -481,13 +481,12 @@ linkLibrary buildTargetDir cleanedExtraLibDirs pkg_descr verbosity runGhcProg li
481481
-- This would be simpler by not adding every object to the invocation, and
482482
-- rather using module names.
483483
unless (null staticObjectFiles) $ do
484-
info verbosity (show (ghcOptPackages (Internal.componentGhcOptions verbosity lbi libBi clbi buildTargetDir)))
485484
traverse_ linkWay wantedWays
486485

487486
-- | Link the executable resulting from building this component, be it an
488487
-- executable, test, or benchmark component.
489488
linkExecutable
490-
:: (GhcOptions)
489+
:: GhcOptions
491490
-- ^ The linker-specific GHC options
492491
-> (BuildWay, BuildWay -> GhcOptions)
493492
-- ^ The wanted build ways and corresponding GhcOptions that were
@@ -528,7 +527,7 @@ linkFLib
528527
:: ForeignLib
529528
-> BuildInfo
530529
-> LocalBuildInfo
531-
-> (GhcOptions)
530+
-> GhcOptions
532531
-- ^ The linker-specific GHC options
533532
-> (BuildWay, BuildWay -> GhcOptions)
534533
-- ^ The wanted build ways and corresponding GhcOptions that were
@@ -574,7 +573,7 @@ linkFLib flib bi lbi linkerOpts (way, buildOpts) targetDir runGhcProg = do
574573
linkOpts :: GhcOptions
575574
linkOpts = case foreignLibType flib of
576575
ForeignLibNativeShared ->
577-
(buildOpts way)
576+
buildOpts way
578577
`mappend` linkerOpts
579578
`mappend` rtsLinkOpts
580579
`mappend` mempty

0 commit comments

Comments
 (0)