diff options
| author | Ian Lynagh <igloo@earth.li> | 2010-11-21 18:35:20 +0000 |
|---|---|---|
| committer | Ian Lynagh <igloo@earth.li> | 2010-11-21 18:35:20 +0000 |
| commit | 6bb8d64a971afce310df3349e8767b790c2845ee (patch) | |
| tree | 2c84c646d1dbafc482c4232e1be9ebfa3c2bd9b0 /utils | |
| parent | 0d348bceca43eaac089d3e5e77dcaa0110a94fe2 (diff) | |
| download | haskell-6bb8d64a971afce310df3349e8767b790c2845ee.tar.gz | |
For bindists, build ghc-pwd with stage 1
rather then the bootstrapping compiler. This fixes problems where the
bootstrapping compiler dynamically links against libraries not on the
target machine.
Diffstat (limited to 'utils')
| -rw-r--r-- | utils/ghc-pwd/Main.hs (renamed from utils/ghc-pwd/ghc-pwd.hs) | 0 | ||||
| -rw-r--r-- | utils/ghc-pwd/ghc-pwd.cabal | 10 | ||||
| -rw-r--r-- | utils/ghc-pwd/ghc.mk | 7 |
3 files changed, 9 insertions, 8 deletions
diff --git a/utils/ghc-pwd/ghc-pwd.hs b/utils/ghc-pwd/Main.hs index 91a5606ac3..91a5606ac3 100644 --- a/utils/ghc-pwd/ghc-pwd.hs +++ b/utils/ghc-pwd/Main.hs diff --git a/utils/ghc-pwd/ghc-pwd.cabal b/utils/ghc-pwd/ghc-pwd.cabal index a7908fbe0d..8fae857e16 100644 --- a/utils/ghc-pwd/ghc-pwd.cabal +++ b/utils/ghc-pwd/ghc-pwd.cabal @@ -11,14 +11,8 @@ Description: build-type: Simple cabal-version: >=1.2 -Flag base3 - Description: Choose the new smaller, split-up base package. - Executable ghc-pwd Main-Is: ghc-pwd.hs - if flag(base3) - Build-Depends: base >= 3 && < 5, - directory >= 1 && < 1.1 - else - Build-Depends: base < 3 + Build-Depends: base >= 3 && < 5, + directory >= 1 && < 1.2 diff --git a/utils/ghc-pwd/ghc.mk b/utils/ghc-pwd/ghc.mk new file mode 100644 index 0000000000..29f74e86b6 --- /dev/null +++ b/utils/ghc-pwd/ghc.mk @@ -0,0 +1,7 @@ + +utils/ghc-pwd_USES_CABAL = YES +utils/ghc-pwd_PACKAGE = ghc-pwd +utils/ghc-pwd_dist_PROG = ghc-pwd$(exeext) + +$(eval $(call build-prog,utils/ghc-pwd,dist,1)) + |