From af9b4778a1ecf24da8f231b7a06b72eb9195ddd2 Mon Sep 17 00:00:00 2001 From: Simon Marlow Date: Fri, 29 Jun 2007 09:07:05 +0000 Subject: [PATCH] unbreak "recompile utils with stage 1" --- compat/compat.mk | 8 +++----- utils/hpc/Makefile | 7 +------ 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/compat/compat.mk b/compat/compat.mk index a9eadb8..db1a6c2 100644 --- a/compat/compat.mk +++ b/compat/compat.mk @@ -48,17 +48,15 @@ SRC_MKDEPENDHS_OPTS += \ -optdep--exclude-module=System.FilePath \ -optdep--exclude-module=System.FilePath.Posix \ -optdep--exclude-module=System.FilePath.Windows \ - -optdep--exclude-module=System.Directory.Internals \ - -optdep--exclude-module=Trace.Hpc.Mix \ - -optdep--exclude-module=Trace.Hpc.Util \ - -optdep--exclude-module=Trace.Hpc.Tix - + -optdep--exclude-module=System.Directory.Internals PACKAGE_CABAL = +PACKAGE_HPC = else PACKAGE_CABAL = -package Cabal +PACKAGE_HPC = -package hpc endif diff --git a/utils/hpc/Makefile b/utils/hpc/Makefile index 46fd693..12ad17e 100644 --- a/utils/hpc/Makefile +++ b/utils/hpc/Makefile @@ -5,13 +5,8 @@ HS_PROG = hpc$(exeext) INSTALL_PROGS += $(HS_PROG) HPC_LIB = $(TOP)/libraries/hpc -# This causes libghccompat.a to be used: include $(GHC_COMPAT_DIR)/compat.mk - -# 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) +SRC_HC_OPTS += $(PACKAGE_HPC) binary-dist: $(INSTALL_DIR) $(BIN_DIST_DIR)/utils/hpc -- 1.7.10.4