diff options
| author | simonmar <unknown> | 2002-09-09 11:44:13 +0000 |
|---|---|---|
| committer | simonmar <unknown> | 2002-09-09 11:44:13 +0000 |
| commit | 5824647099a9d75e8c1b9e0f67abc8757456b624 (patch) | |
| tree | 09677c5fff058d1e0bdc0118ac0648e713e2057f | |
| parent | 394d30831452e862f85e8ea6458351f56130f8ba (diff) | |
| download | haskell-5824647099a9d75e8c1b9e0f67abc8757456b624.tar.gz | |
[project @ 2002-09-09 11:44:13 by simonmar]
Build without hslibs on GHC >= 5.04
| -rw-r--r-- | ghc/utils/genprimopcode/Main.hs | 7 | ||||
| -rw-r--r-- | ghc/utils/genprimopcode/Makefile | 9 |
2 files changed, 13 insertions, 3 deletions
diff --git a/ghc/utils/genprimopcode/Main.hs b/ghc/utils/genprimopcode/Main.hs index f9306fbad0..49d3921a35 100644 --- a/ghc/utils/genprimopcode/Main.hs +++ b/ghc/utils/genprimopcode/Main.hs @@ -1,11 +1,16 @@ - +{-# OPTIONS -cpp #-} ------------------------------------------------------------------ -- A primop-table mangling program -- ------------------------------------------------------------------ module Main where +#if __GLASGOW_HASKELL__ >= 504 +import Text.ParserCombinators.Parsec +#else import Parsec +#endif + import Monad import Char import List diff --git a/ghc/utils/genprimopcode/Makefile b/ghc/utils/genprimopcode/Makefile index f16002496e..8c3da0f2fa 100644 --- a/ghc/utils/genprimopcode/Makefile +++ b/ghc/utils/genprimopcode/Makefile @@ -1,11 +1,16 @@ # ----------------------------------------------------------------------------- -# $Id: Makefile,v 1.7 2001/08/08 13:21:04 qrczak Exp $ +# $Id: Makefile,v 1.8 2002/09/09 11:44:13 simonmar Exp $ TOP=../.. include $(TOP)/mk/boilerplate.mk HS_PROG = genprimopcode -SRC_HC_OPTS += -syslib text + +ghc_ge_504 = $(shell if (test $(GhcCanonVersion) -ge 504); then echo YES; else echo NO; fi) + +ifeq "$(ghc_ge_504)" "NO" +SRC_HC_OPTS += -package text +endif # genprimopcode is needed to boot in ghc/compiler... ifneq "$(BootingFromHc)" "YES" |