diff options
| author | Ian Lynagh <igloo@earth.li> | 2008-07-08 00:27:17 +0000 |
|---|---|---|
| committer | Ian Lynagh <igloo@earth.li> | 2008-07-08 00:27:17 +0000 |
| commit | 2002bc3d77b9e601287cd0499c0f815ebc992ea0 (patch) | |
| tree | 609aaf2ef554f672d81e63409af0a9346702fe83 /utils | |
| parent | 69adcec2c70afb3e940fae0a5c64589cfa09ad56 (diff) | |
| download | haskell-2002bc3d77b9e601287cd0499c0f815ebc992ea0.tar.gz | |
Get rid of compat/
Compat.Unicode is not utils/Unicode in the compiler.
We build the hpc package with the stage1 compiler.
Nothing else in the compat package was still used.
Diffstat (limited to 'utils')
| -rw-r--r-- | utils/ghc-pkg/Makefile | 8 | ||||
| -rw-r--r-- | utils/hpc/Makefile | 3 |
2 files changed, 1 insertions, 10 deletions
diff --git a/utils/ghc-pkg/Makefile b/utils/ghc-pkg/Makefile index adce82949b..5afb448a22 100644 --- a/utils/ghc-pkg/Makefile +++ b/utils/ghc-pkg/Makefile @@ -15,16 +15,8 @@ endif SRC_HC_OPTS += -cpp -Wall -fno-warn-name-shadowing -fno-warn-unused-matches -# This causes libghccompat.a to be used: -include $(GHC_COMPAT_DIR)/compat.mk - SRC_HC_OPTS += $(PACKAGE_CABAL) -# This is required because libghccompat.a must be built with -# $(GhcHcOpts) because it is linked to the compiler, and hence -# we must also build with $(GhcHcOpts) here: -SRC_HC_OPTS += $(GhcHcOpts) $(GhcStage1HcOpts) - ifeq "$(Windows)" "NO" SRC_HC_OPTS += -package unix endif diff --git a/utils/hpc/Makefile b/utils/hpc/Makefile index 3b1d731050..ac1bf22a9a 100644 --- a/utils/hpc/Makefile +++ b/utils/hpc/Makefile @@ -20,8 +20,7 @@ endif INSTALL_PROGS += $(HS_PROG) HPC_LIB = $(TOP)/libraries/hpc -include $(GHC_COMPAT_DIR)/compat.mk -SRC_HC_OPTS += $(PACKAGE_HPC) -cpp +SRC_HC_OPTS += -package hpc -cpp ifeq "$(ghc_ge_607)" "YES" SRC_HC_OPTS += -package containers |