[commit: nofib] master: Tweak the Makefiles (59add55)

[Ian Lynagh]

Repository : ssh://darcs.haskell.org//srv/darcs/nofib

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/59add5574001fdd3880f23d8def62b42780caf57

>---------------------------------------------------------------

commit 59add5574001fdd3880f23d8def62b42780caf57
Author: Ian Lynagh <ian at well-typed.com>
Date:   Tue May 28 17:58:27 2013 +0100

    Tweak the Makefiles

>---------------------------------------------------------------

 mk/boilerplate.mk |    6 +-----
 1 files changed, 1 insertions(+), 5 deletions(-)

diff --git a/mk/boilerplate.mk b/mk/boilerplate.mk
index e241712..5dc6ddb 100644
--- a/mk/boilerplate.mk
+++ b/mk/boilerplate.mk
@@ -18,7 +18,7 @@ show:
 NOFIB_TOP := $(TOP)
 include $(NOFIB_TOP)/../mk/tree.mk
 include $(NOFIB_TOP)/../mk/config.mk
-GHC_TOP := $(TOP)
+include $(NOFIB_TOP)/../mk/custom-settings.mk
 TOP := $(NOFIB_TOP)
 
 RM = rm -f
@@ -60,10 +60,6 @@ NoFibRuns = 5
 
 WAYS=$(NoFibWays)
 
-TOP := $(GHC_TOP)
--include $(GHC_TOP)/mk/build.mk
-TOP := $(NOFIB_TOP)
-
 SRC_HC_OPTS += $(NoFibHcOpts) -Rghc-timing
 
 # -package array is needed for GHC 7.0.1 and later, as the haskell98 package