Commit 6e024937 authored by ian@well-typed.com's avatar ian@well-typed.com

Make the nofib build system independent of the GHC build system

parent 6d9c6d26
...@@ -15,12 +15,6 @@ default : all ...@@ -15,12 +15,6 @@ default : all
show: show:
@echo '$(VALUE)="$($(VALUE))"' @echo '$(VALUE)="$($(VALUE))"'
NOFIB_TOP := $(TOP)
include $(NOFIB_TOP)/../mk/tree.mk
include $(NOFIB_TOP)/../mk/config.mk
include $(NOFIB_TOP)/../mk/custom-settings.mk
TOP := $(NOFIB_TOP)
RM = rm -f RM = rm -f
SIZE = size SIZE = size
STRIP = strip STRIP = strip
...@@ -120,11 +114,11 @@ endef ...@@ -120,11 +114,11 @@ endef
$(eval $(call ghc-ge,6,13)) $(eval $(call ghc-ge,6,13))
RUNTEST = $(NOFIB_TOP)/runstdtest/runstdtest RUNTEST = $(TOP)/runstdtest/runstdtest
include $(NOFIB_TOP)/mk/ghc-paths.mk include $(TOP)/mk/ghc-paths.mk
include $(NOFIB_TOP)/mk/ghc-opts.mk include $(TOP)/mk/ghc-opts.mk
include $(NOFIB_TOP)/mk/paths.mk include $(TOP)/mk/paths.mk
include $(NOFIB_TOP)/mk/opts.mk include $(TOP)/mk/opts.mk
-include .depend -include .depend
...@@ -115,7 +115,7 @@ endif # GHCI ...@@ -115,7 +115,7 @@ endif # GHCI
# We do this at the end for cosmetic reasons: it means that the "normal-way" # We do this at the end for cosmetic reasons: it means that the "normal-way"
# runtests will precede the "other-way" recursive invocations of make # runtests will precede the "other-way" recursive invocations of make
include $(NOFIB_TOP)/mk/ghc-target.mk include $(TOP)/mk/ghc-target.mk
# Override suffix rules # Override suffix rules
include $(NOFIB_TOP)/mk/suffix.mk include $(TOP)/mk/suffix.mk
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment