aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2014-04-21 10:57:01 -0400
committerGravatar Joey Hess <joey@kitenet.net>2014-04-21 10:57:01 -0400
commit852d7e3d1877e3650b1c6589f7e75773ea67d610 (patch)
tree9cdf407bacd080d7b622d949092e9c7a3e98fd7c
parent443c7fc6feef3f75ab6552dadf40fb15fd335b82 (diff)
better approach for building distributionupdate
Use cabal include file
-rw-r--r--Makefile2
-rw-r--r--Utility/URI.hs2
2 files changed, 1 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 5c474e9ca..cbc369572 100644
--- a/Makefile
+++ b/Makefile
@@ -253,7 +253,7 @@ hdevtools:
distributionupdate:
git pull
cabal configure
- ghc --make Build/DistributionUpdate -XPackageImports
+ ghc --make Build/DistributionUpdate -XPackageImports -optP-include -optPdist/build/autogen/cabal_macros.h
./Build/DistributionUpdate
.PHONY: git-annex git-union-merge git-recover-repository tags build-stamp
diff --git a/Utility/URI.hs b/Utility/URI.hs
index 240159609..39c2f2289 100644
--- a/Utility/URI.hs
+++ b/Utility/URI.hs
@@ -10,11 +10,9 @@
module Utility.URI where
-- Old versions of network lacked an Ord for URI
-#ifdef VERSION_network
#if ! MIN_VERSION_network(2,4,0)
import Network.URI
instance Ord URI where
a `compare` b = show a `compare` show b
#endif
-#endif