summaryrefslogtreecommitdiff
path: root/hadrian/hadrian.cabal
diff options
context:
space:
mode:
authorP.C. Shyamshankar <shyam@galois.com>2019-01-24 13:07:34 -0500
committerMarge Bot <ben+marge-bot@smart-cactus.org>2019-03-06 09:17:22 -0500
commit2ff77b9894eecf51fa619ed2266ca196e296cd1e (patch)
tree656eaf880e2e76ffb39b2c24a21fc1ace11004bb /hadrian/hadrian.cabal
parentdb039a4a10fc8fa9e03e6781d1c0dc33151beda6 (diff)
downloadhaskell-2ff77b9894eecf51fa619ed2266ca196e296cd1e.tar.gz
Handle absolute paths to build roots in Hadrian.
Fixes #16187. This patch fixes various path concatenation issues to allow functioning builds with hadrian when the build root location is specified with an absolute path. Remarks: - The path concatenation operator (-/-) now handles absolute second operands appropriately. Its behavior should match that of POSIX (</>) in this regard. - The `getDirectoryFiles*` family of functions only searches for matches under the directory tree rooted by its first argument; all of the results are also relative to this root. If the first argument is the empty string, the current working directory is used. This patch passes the appropriate directory (almost always either `top` or `root`), and subsequently attaches that directory prefix so that the paths refer to the appropriate files. - Windows `tar` does not like colons (':') in paths to archive files, it tries to resolve them as remote paths. The `--force-local` option remedies this, and is applied on windows builds.
Diffstat (limited to 'hadrian/hadrian.cabal')
-rw-r--r--hadrian/hadrian.cabal1
1 files changed, 1 insertions, 0 deletions
diff --git a/hadrian/hadrian.cabal b/hadrian/hadrian.cabal
index 56c68aa0c3..a5a1ead0e7 100644
--- a/hadrian/hadrian.cabal
+++ b/hadrian/hadrian.cabal
@@ -121,6 +121,7 @@ executable hadrian
, containers >= 0.5 && < 0.7
, directory >= 1.2 && < 1.4
, extra >= 1.4.7
+ , filepath
, mtl == 2.2.*
, parsec >= 3.1 && < 3.2
, QuickCheck >= 2.6 && < 2.13