diff options
| author | Matthew Pickering <matthewtpickering@gmail.com> | 2022-01-18 11:52:18 +0000 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2022-02-03 14:44:17 -0500 |
| commit | e343526bdf2f50aa5a843e8649acf8b597bc4d80 (patch) | |
| tree | d44ffd8f26b3b124b307ce209504671c95861649 | |
| parent | cae1fb1732deef1b8269de96a88ef053148bb4d8 (diff) | |
| download | haskell-e343526bdf2f50aa5a843e8649acf8b597bc4d80.tar.gz | |
Don't initialise plugins when there are no pipelines to run
| -rw-r--r-- | compiler/GHC/Driver/Make.hs | 2 | ||||
| -rw-r--r-- | testsuite/tests/plugins/plugins04.stderr | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/compiler/GHC/Driver/Make.hs b/compiler/GHC/Driver/Make.hs index 4ec6d13348..8d30fa402e 100644 --- a/compiler/GHC/Driver/Make.hs +++ b/compiler/GHC/Driver/Make.hs @@ -2518,6 +2518,8 @@ label_self thread_name = do runPipelines :: Int -> HscEnv -> Maybe Messager -> [MakeAction] -> IO () +-- Don't even initialise plugins if there are no pipelines +runPipelines _ _ _ [] = return () runPipelines n_job orig_hsc_env mHscMessager all_pipelines = do liftIO $ label_self "main --make thread" diff --git a/testsuite/tests/plugins/plugins04.stderr b/testsuite/tests/plugins/plugins04.stderr index 46c0f9ce55..67922911fb 100644 --- a/testsuite/tests/plugins/plugins04.stderr +++ b/testsuite/tests/plugins/plugins04.stderr @@ -1,2 +1,2 @@ -Module imports form a cycle: - module ‘HomePackagePlugin’ (./HomePackagePlugin.hs) imports itself
\ No newline at end of file +Module graph contains a cycle: + module ‘HomePackagePlugin’ (./HomePackagePlugin.hs) imports itself |