diff options
| -rw-r--r-- | compiler/ghc.cabal.in | 2 | ||||
| -rw-r--r-- | ghc/ghc-bin.cabal.in | 2 | ||||
| m--------- | libraries/Cabal | 0 | ||||
| m--------- | libraries/directory | 0 | ||||
| m--------- | libraries/hpc | 0 | ||||
| m--------- | libraries/time | 0 | ||||
| m--------- | libraries/unix | 0 | ||||
| -rw-r--r-- | utils/ghc-cabal/Main.hs | 4 | ||||
| -rw-r--r-- | utils/ghc-cabal/ghc.mk | 18 |
9 files changed, 14 insertions, 12 deletions
diff --git a/compiler/ghc.cabal.in b/compiler/ghc.cabal.in index faeb4f6520..1195fa6cbc 100644 --- a/compiler/ghc.cabal.in +++ b/compiler/ghc.cabal.in @@ -63,7 +63,7 @@ Library process >= 1 && < 1.7, bytestring >= 0.9 && < 0.11, binary == 0.8.*, - time >= 1.4 && < 1.10, + time >= 1.4 && < 1.12, containers >= 0.6.2.1 && < 0.7, array >= 0.1 && < 0.6, filepath >= 1 && < 1.5, diff --git a/ghc/ghc-bin.cabal.in b/ghc/ghc-bin.cabal.in index 5884984474..2e42221d47 100644 --- a/ghc/ghc-bin.cabal.in +++ b/ghc/ghc-bin.cabal.in @@ -63,7 +63,7 @@ Executable ghc ghci == @ProjectVersionMunged@, haskeline == 0.8.*, exceptions == 0.10.*, - time >= 1.8 && < 1.10 + time >= 1.8 && < 1.12 CPP-Options: -DHAVE_INTERNAL_INTERPRETER Other-Modules: GHCi.Leak diff --git a/libraries/Cabal b/libraries/Cabal -Subproject 5aea8a4b8463e1ae95272e190a1022764164294 +Subproject d30b8f3ec0b0873b9d2eb245afdd53fabacdb88 diff --git a/libraries/directory b/libraries/directory -Subproject cecf363bc07004ad314e0297ce34ddba05031c0 +Subproject 0633b48b010093f64f98ee494265436e96456ae diff --git a/libraries/hpc b/libraries/hpc -Subproject fecf0496a65c4be275d613eb0632fecd5a123b6 +Subproject 59e6ba02f3fa5c8f4901b4ce21777c4a9beb14b diff --git a/libraries/time b/libraries/time -Subproject 5319bed3b14c21de5410ead88ec8aaa838d7339 +Subproject c25d6a76702b454426e149fb590da5cb69f3bd0 diff --git a/libraries/unix b/libraries/unix -Subproject 8abd63ea234de02d2b3cb08b5098cd06c1a728f +Subproject e079823775066bcab56b22842be6cce6e060fb9 diff --git a/utils/ghc-cabal/Main.hs b/utils/ghc-cabal/Main.hs index 92587971e7..78efc133f1 100644 --- a/utils/ghc-cabal/Main.hs +++ b/utils/ghc-cabal/Main.hs @@ -1,3 +1,4 @@ +{-# LANGUAGE CPP #-} {-# OPTIONS_GHC -fno-warn-warnings-deprecations #-} {-# OPTIONS_GHC -Wno-incomplete-uni-patterns #-} @@ -28,6 +29,7 @@ import Distribution.Verbosity import qualified Distribution.InstalledPackageInfo as Installed import qualified Distribution.Simple.PackageIndex as PackageIndex import Distribution.Utils.ShortText (fromShortText) +import Distribution.Utils.Path (getSymbolicPath) import Control.Exception (bracket) import Control.Monad @@ -433,7 +435,7 @@ generate directory distdir config_args variablePrefix ++ "_MODULES = " ++ unwords mods, variablePrefix ++ "_HIDDEN_MODULES = " ++ unwords otherMods, variablePrefix ++ "_SYNOPSIS =" ++ (unwords $ lines $ fromShortText $ synopsis pd), - variablePrefix ++ "_HS_SRC_DIRS = " ++ unwords (hsSourceDirs bi), + variablePrefix ++ "_HS_SRC_DIRS = " ++ unwords (map getSymbolicPath $ hsSourceDirs bi), variablePrefix ++ "_DEPS = " ++ unwords deps, variablePrefix ++ "_DEP_IPIDS = " ++ unwords dep_ipids, variablePrefix ++ "_DEP_NAMES = " ++ unwords depNames, diff --git a/utils/ghc-cabal/ghc.mk b/utils/ghc-cabal/ghc.mk index a964e55070..145fc8fca5 100644 --- a/utils/ghc-cabal/ghc.mk +++ b/utils/ghc-cabal/ghc.mk @@ -38,20 +38,20 @@ $(ghc-cabal_INPLACE) : $(ghc-cabal_DIST_BINARY) | $$(dir $$@)/. "$(CP)" $< $@ # Minor hack, since we can't reuse the `hs-suffix-rules-srcdir` macro -ifneq ($(wildcard libraries/Cabal/Cabal/Distribution/Fields/Lexer.x),) +ifneq ($(wildcard libraries/Cabal/Cabal/src/Distribution/Fields/Lexer.x),) # Lexer.x exists so we have to call Alex ourselves -CABAL_LEXER_DEP := bootstrapping/Cabal/Distribution/Fields/Lexer.hs +CABAL_LEXER_DEP := bootstrapping/Cabal/src/Distribution/Fields/Lexer.hs -bootstrapping/Cabal/Distribution/Fields/Lexer.hs: libraries/Cabal/Cabal/Distribution/Fields/Lexer.x - mkdir -p bootstrapping/Cabal/Distribution/Fields +bootstrapping/Cabal/src/Distribution/Fields/Lexer.hs: libraries/Cabal/Cabal/src/Distribution/Fields/Lexer.x + mkdir -p bootstrapping/Cabal/src/Distribution/Fields $(call cmd,ALEX) $< -o $@ else -CABAL_LEXER_DEP := libraries/Cabal/Cabal/Distribution/Fields/Lexer.hs +CABAL_LEXER_DEP := libraries/Cabal/Cabal/src/Distribution/Fields/Lexer.hs endif -$(ghc-cabal_DIST_BINARY): $(wildcard libraries/Cabal/Cabal/Distribution/*/*/*.hs) -$(ghc-cabal_DIST_BINARY): $(wildcard libraries/Cabal/Cabal/Distribution/*/*.hs) -$(ghc-cabal_DIST_BINARY): $(wildcard libraries/Cabal/Cabal/Distribution/*.hs) +$(ghc-cabal_DIST_BINARY): $(wildcard libraries/Cabal/Cabal/src/Distribution/*/*/*.hs) +$(ghc-cabal_DIST_BINARY): $(wildcard libraries/Cabal/Cabal/src/Distribution/*/*.hs) +$(ghc-cabal_DIST_BINARY): $(wildcard libraries/Cabal/Cabal/src/Distribution/*.hs) # N.B. Compile with -O0 since this is not a performance-critical executable # and the Cabal takes nearly twice as long to build with -O1. See #16817. @@ -70,7 +70,7 @@ $(ghc-cabal_DIST_BINARY): $(CABAL_LEXER_DEP) utils/ghc-cabal/Main.hs $(TOUCH_DEP -odir bootstrapping \ -hidir bootstrapping \ $(CABAL_LEXER_DEP) \ - -ilibraries/Cabal/Cabal \ + -ilibraries/Cabal/Cabal/src \ -ilibraries/binary/src \ -ilibraries/filepath \ -ilibraries/hpc \ |