From c4b667e8718f23bc49d05227fa34bbdb1f0f2056 Mon Sep 17 00:00:00 2001 From: Pepe Iborra Date: Sun, 9 May 2021 18:25:56 +0100 Subject: [PATCH] ghc-api cleanups --- ghcide/ghcide.cabal | 6 ------ haskell-language-server.cabal | 1 - .../hls-explicit-imports-plugin.cabal | 1 - .../include/ghc-api-version.h | 10 ---------- plugins/hls-retrie-plugin/hls-retrie-plugin.cabal | 1 - plugins/hls-retrie-plugin/include/ghc-api-version.h | 10 ---------- 6 files changed, 29 deletions(-) delete mode 100644 plugins/hls-explicit-imports-plugin/include/ghc-api-version.h delete mode 100644 plugins/hls-retrie-plugin/include/ghc-api-version.h diff --git a/ghcide/ghcide.cabal b/ghcide/ghcide.cabal index 42a3867174..93388e3ee0 100644 --- a/ghcide/ghcide.cabal +++ b/ghcide/ghcide.cabal @@ -133,8 +133,6 @@ library hs-source-dirs: src session-loader - include-dirs: - include exposed-modules: Control.Concurrent.Strict Generics.SYB.GHC @@ -252,8 +250,6 @@ benchmark benchHist executable ghcide default-language: Haskell2010 - include-dirs: - include hs-source-dirs: exe ghc-options: -threaded @@ -369,7 +365,6 @@ test-suite ghcide-tests record-dot-preprocessor, record-hasfield hs-source-dirs: test/cabal test/exe test/src bench/lib - include-dirs: include ghc-options: -threaded -Wall -Wno-name-shadowing -O0 -Wno-unticked-promoted-constructors main-is: Main.hs other-modules: @@ -415,7 +410,6 @@ executable ghcide-bench shake, text hs-source-dirs: bench/lib bench/exe - include-dirs: include ghc-options: -threaded -Wall -Wno-name-shadowing -rtsopts main-is: Main.hs other-modules: diff --git a/haskell-language-server.cabal b/haskell-language-server.cabal index 136121985f..ec6d8ded18 100644 --- a/haskell-language-server.cabal +++ b/haskell-language-server.cabal @@ -348,7 +348,6 @@ executable haskell-language-server , transformers , unordered-containers - include-dirs: include default-language: Haskell2010 default-extensions: DataKinds, TypeOperators diff --git a/plugins/hls-explicit-imports-plugin/hls-explicit-imports-plugin.cabal b/plugins/hls-explicit-imports-plugin/hls-explicit-imports-plugin.cabal index 1ade9e28c7..d7fb907c61 100644 --- a/plugins/hls-explicit-imports-plugin/hls-explicit-imports-plugin.cabal +++ b/plugins/hls-explicit-imports-plugin/hls-explicit-imports-plugin.cabal @@ -29,7 +29,6 @@ library , unordered-containers default-language: Haskell2010 - include-dirs: include default-extensions: DataKinds TypeOperators diff --git a/plugins/hls-explicit-imports-plugin/include/ghc-api-version.h b/plugins/hls-explicit-imports-plugin/include/ghc-api-version.h deleted file mode 100644 index ffe3029190..0000000000 --- a/plugins/hls-explicit-imports-plugin/include/ghc-api-version.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef GHC_API_VERSION_H -#define GHC_API_VERSION_H - -#ifdef GHC_LIB -#define MIN_VERSION_ghc(x,y,z) MIN_VERSION_ghc_lib(x,y,z) -#else -#define MIN_VERSION_ghc(x,y,z) MIN_VERSION_ghc(x,y,z) -#endif - -#endif diff --git a/plugins/hls-retrie-plugin/hls-retrie-plugin.cabal b/plugins/hls-retrie-plugin/hls-retrie-plugin.cabal index b0d562e5d9..978abeb285 100644 --- a/plugins/hls-retrie-plugin/hls-retrie-plugin.cabal +++ b/plugins/hls-retrie-plugin/hls-retrie-plugin.cabal @@ -34,7 +34,6 @@ library , unordered-containers default-language: Haskell2010 - include-dirs: include default-extensions: DataKinds TypeOperators diff --git a/plugins/hls-retrie-plugin/include/ghc-api-version.h b/plugins/hls-retrie-plugin/include/ghc-api-version.h deleted file mode 100644 index ffe3029190..0000000000 --- a/plugins/hls-retrie-plugin/include/ghc-api-version.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef GHC_API_VERSION_H -#define GHC_API_VERSION_H - -#ifdef GHC_LIB -#define MIN_VERSION_ghc(x,y,z) MIN_VERSION_ghc_lib(x,y,z) -#else -#define MIN_VERSION_ghc(x,y,z) MIN_VERSION_ghc(x,y,z) -#endif - -#endif