Commit 18860bbf authored by nominolo@gmail.com's avatar nominolo@gmail.com
Browse files

Take advantage of configurations to build Cabal itself and fix bootstrapping problem.

parent 23ea84f0
...@@ -3,10 +3,8 @@ Version: 1.1.7 ...@@ -3,10 +3,8 @@ Version: 1.1.7
--FIXME: we need a CPP-Options field --FIXME: we need a CPP-Options field
GHC-Options: -DCABAL_VERSION=1,1,7 -Wall GHC-Options: -DCABAL_VERSION=1,1,7 -Wall
CC-Options: "-DCABAL_VERSION=1,1,7" CC-Options: "-DCABAL_VERSION=1,1,7"
nhc-Options: -K4M nhc98-Options: -K4M
Copyright: 2003-2006, Isaac Jones Copyright: 2003-2006, Isaac Jones
-- For ghc 6.2 you need to add 'unix' to Build-Depends:
Build-Depends: base, filepath, pretty, directory, old-time, process
License: BSD3 License: BSD3
License-File: LICENSE License-File: LICENSE
Author: Isaac Jones <ijones@syntaxpolice.org> Author: Isaac Jones <ijones@syntaxpolice.org>
...@@ -22,7 +20,27 @@ Description: ...@@ -22,7 +20,27 @@ Description:
for distributing, organizing, and cataloging Haskell libraries for distributing, organizing, and cataloging Haskell libraries
and tools. and tools.
Category: Distribution Category: Distribution
Exposed-Modules:
Flag small_base {
Description: Choose the new smaller, split-up base package.
}
Library {
if flag(small_base) {
-- For ghc 6.2 you need to add 'unix' to Build-Depends:
Build-Depends: base, filepath, pretty, directory, old-time, process
} else {
Build-Depends: base, filepath
}
--FIXME: we need a CPP-Options field
GHC-Options: -DCABAL_VERSION=1,1,7 -Wall
CC-Options: "-DCABAL_VERSION=1,1,7"
nhc98-Options: -K4M
Exposed-Modules:
Distribution.Compiler, Distribution.Compiler,
Distribution.Extension, Distribution.Extension,
Distribution.InstalledPackageInfo, Distribution.InstalledPackageInfo,
...@@ -31,7 +49,7 @@ Exposed-Modules: ...@@ -31,7 +49,7 @@ Exposed-Modules:
Distribution.Program, Distribution.Program,
Distribution.Package, Distribution.Package,
Distribution.PackageDescription, Distribution.PackageDescription,
Distribution.Configuration, Distribution.Configuration,
Distribution.ParseUtils, Distribution.ParseUtils,
Distribution.PreProcess, Distribution.PreProcess,
Distribution.PreProcess.Unlit, Distribution.PreProcess.Unlit,
...@@ -55,13 +73,17 @@ Exposed-Modules: ...@@ -55,13 +73,17 @@ Exposed-Modules:
Distribution.Version, Distribution.Version,
Distribution.Compat.ReadP, Distribution.Compat.ReadP,
Language.Haskell.Extension Language.Haskell.Extension
Other-Modules:
Other-Modules:
Distribution.GetOpt, Distribution.GetOpt,
Distribution.Compat.Map, Distribution.Compat.Map,
Distribution.Compat.Directory, Distribution.Compat.Directory,
Distribution.Compat.Exception, Distribution.Compat.Exception,
Distribution.Compat.RawSystem, Distribution.Compat.RawSystem,
Distribution.Compat.TempFile Distribution.Compat.TempFile
Extra-Source-Files:
Extra-Source-Files:
mkGHCMakefile.sh Distribution/Simple/GHCMakefile.in mkGHCMakefile.sh Distribution/Simple/GHCMakefile.in
Extensions: CPP
Extensions: CPP
}
\ No newline at end of file
...@@ -3,7 +3,7 @@ CABALVERSION=1.1.7 ...@@ -3,7 +3,7 @@ CABALVERSION=1.1.7
KIND=rc KIND=rc
#KIND=latest #KIND=latest
GHCFLAGS= --make -cpp -Wall GHCFLAGS= --make -cpp -Wall -DCABAL_VERSION=1,1,7
# later: -Wall # later: -Wall
PREF=/usr/local PREF=/usr/local
USER_FLAG = USER_FLAG =
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment