mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

better approach for building distributionupdate

Browse source 
Use cabal include file
This commit is contained in:
Joey Hess 2014-04-21 10:57:01 -04:00
parent a10d3731b8
commit 515d251127
Failed to extract signature
2 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile
View file

@ -253,7 +253,7 @@ hdevtools:
distributionupdate: distributionupdate:
git pull git pull
cabal configure cabal configure
ghc --make Build/DistributionUpdate -XPackageImports ghc --make Build/DistributionUpdate -XPackageImports -optP-include -optPdist/build/autogen/cabal_macros.h
./Build/DistributionUpdate ./Build/DistributionUpdate
.PHONY: git-annex git-union-merge git-recover-repository tags build-stamp .PHONY: git-annex git-union-merge git-recover-repository tags build-stamp

2
Utility/URI.hs
View file

@ -10,11 +10,9 @@
module Utility.URI where module Utility.URI where
-- Old versions of network lacked an Ord for URI -- Old versions of network lacked an Ord for URI
#ifdef VERSION_network
#if ! MIN_VERSION_network(2,4,0) #if ! MIN_VERSION_network(2,4,0)
import Network.URI import Network.URI
instance Ord URI where instance Ord URI where
a `compare` b = show a `compare` show b a `compare` b = show a `compare` show b
#endif #endif
#endif