Commit 7df4dbc1 authored by Ben Gamari's avatar Ben Gamari 🐢 Committed by Andreas Klebinger

Introduce SRC_DEPS variable

Instead of passing package dependencies via `SRC_HC_OPTS=-package ...`
we rather pass them via `SRC_DEPS`, allowing the build system to
know about the dependency.
parent 1b72258f
......@@ -3,8 +3,8 @@ include $(TOP)/mk/boilerplate.mk
NORM_OPTS = 300000
SRC_HC_OPTS += -package array
SRC_RUNTEST_OPTS += +RTS -K64m -RTS
SRC_DEPS = array
ifeq "$(HEAP)" "LARGE"
SRC_RUNTEST_OPTS += +RTS -H128m -RTS
......
TOP = ../..
include $(TOP)/mk/boilerplate.mk
SRC_HC_OPTS += -cpp -package old-time
SRC_HC_OPTS += -cpp
SRC_DEPS = old-time
# kLongLivedTreeDepth = 17 :: Int
# kArraySize = 500000 :: Int
......
......@@ -3,7 +3,8 @@ TOP = ../..
include $(TOP)/mk/boilerplate.mk
NORM_OPTS = TestInput.y
SRC_HC_OPTS += -cpp -package containers
SRC_HC_OPTS += -cpp
SRC_DEPS = containers
EXCLUDED_SRCS += TestInput.hs
ifeq "$(HEAP)" "LARGE"
......
......@@ -7,7 +7,7 @@ all boot :: input
input : words
cat words words words words words words words words words words >$@
SRC_HC_OPTS += -package containers
SRC_DEPS = containers
NORM_OPTS = words input
ifeq "$(HEAP)" "LARGE"
......
......@@ -6,4 +6,4 @@ FAST_OPTS = 150000
NORM_OPTS = 1500000
SLOW_OPTS = 7500000
SRC_HC_OPTS += -package array
SRC_DEPS = array
......@@ -59,7 +59,7 @@ endif
# All the standard gluing together, as in the comment right at the front
HC_OPTS = $(BOOTSTRAPPING_PACKAGE_CONF_HC_OPTS) $(SRC_HC_OPTS) $(WAY$(_way)_HC_OPTS) $($*_HC_OPTS) $(EXTRA_HC_OPTS)
HC_OPTS = $(BOOTSTRAPPING_PACKAGE_CONF_HC_OPTS) $(SRC_HC_OPTS) $(WAY$(_way)_HC_OPTS) $($*_HC_OPTS) $(EXTRA_HC_OPTS) $(addprefix -package, $(SRC_DEPS))
ifeq "$(HC_VERSION_GE_6_13)" "YES"
HC_OPTS += -rtsopts
endif
......
......@@ -2,7 +2,7 @@ TOP = ../..
include $(TOP)/mk/boilerplate.mk
PROG_ARGS = 10000 15000000
SRC_HC_OPTS += -package parallel
SRC_DEPS += parallel
include $(TOP)/mk/target.mk
......@@ -7,6 +7,6 @@ include $(TOP)/mk/boilerplate.mk
# This version builds a list of the results, and needs a lot of memory:
SRC_RUNTEST_OPTS += 3 873
SRC_HC_OPTS += -package parallel
SRC_DEPS = parallel
include $(TOP)/mk/target.mk
......@@ -13,6 +13,7 @@
TOP = ../..
include $(TOP)/mk/boilerplate.mk
SRC_HC_OPTS += -package parallel -package parsec -fvia-C -fexcess-precision
SRC_HC_OPTS = -fvia-C -fexcess-precision
SRC_DEPS = parallel parsec
include $(TOP)/mk/target.mk
TOP = ../..
include $(TOP)/mk/boilerplate.mk
SRC_HC_OPTS += -cpp -DSTRATEGIES -package random -package parallel
SRC_HC_OPTS += -cpp -DSTRATEGIES
SRC_DEPS = random parallel
# 28 = version
# 83 = input
......
......@@ -3,6 +3,6 @@ include $(TOP)/mk/boilerplate.mk
SRC_RUNTEST_OPTS += -2.0 -2.0 2.0 2.0 1024 1024 256
SRC_RUNTEST_OPTS += -stdout-binary
SRC_HC_OPTS += -package parallel
SRC_DEPS = parallel
include $(TOP)/mk/target.mk
......@@ -9,7 +9,7 @@ include $(TOP)/mk/boilerplate.mk
FAST_OPTS = 100 1 10
NORM_OPTS = 600 1 10
SLOW_OPTS = 1000 1 10
SRC_HC_OPTS += -package parallel
SRC_DEPS = parallel
# FAST_OPTS =
# NORM_OPTS =
......
......@@ -3,11 +3,11 @@ include $(TOP)/mk/boilerplate.mk
SRCS = Board.hs \
Game.hs \
Prog.hs \
Tree.hs \
Wins.hs \
Main.hs
HC_OPTS += -package parallel -package random
Prog.hs \
Tree.hs \
Wins.hs \
Main.hs
SRC_DEPS = parallel random
PROG_ARGS = 4 6
......
......@@ -2,7 +2,7 @@ TOP = ../..
include $(TOP)/mk/boilerplate.mk
PROG_ARGS = 3000
SRC_HC_OPTS += -package parallel
SRC_DEPS = parallel
include $(TOP)/mk/target.mk
......@@ -2,6 +2,6 @@ TOP = ../..
include $(TOP)/mk/boilerplate.mk
SRC_RUNTEST_OPTS += 43 11
SRC_HC_OPTS += -package parallel
SRC_DEPS = parallel
include $(TOP)/mk/target.mk
......@@ -5,6 +5,6 @@ include $(TOP)/mk/boilerplate.mk
FAST_OPTS = 34 15 8
NORM_OPTS = 36 17 8
SLOW_OPTS = 34 18 8
SRC_HC_OPTS += -package parallel
SRC_DEPS = parallel
include $(TOP)/mk/target.mk
......@@ -2,7 +2,7 @@ TOP = ../..
include $(TOP)/mk/boilerplate.mk
PROG_ARGS = 300 100
SRC_HC_OPTS += -package parallel
SRC_DEPS = parallel
include $(TOP)/mk/target.mk
......@@ -2,7 +2,7 @@ TOP = ../..
include $(TOP)/mk/boilerplate.mk
PROG_ARGS = 500000
SRC_HC_OPTS += -package parallel
SRC_DEPS = parallel
include $(TOP)/mk/target.mk
......@@ -2,6 +2,6 @@ TOP = ../..
include $(TOP)/mk/boilerplate.mk
SRC_RUNTEST_OPTS += 13
SRC_HC_OPTS += -package parallel
SRC_DEPS = parallel
include $(TOP)/mk/target.mk
......@@ -2,7 +2,7 @@ TOP = ../..
include $(TOP)/mk/boilerplate.mk
PROG_ARGS = 1000
SRC_HC_OPTS += -package parallel
SRC_DEPS = parallel
include $(TOP)/mk/target.mk
......@@ -2,7 +2,7 @@ TOP = ../..
include $(TOP)/mk/boilerplate.mk
PROG_ARGS = 38 8000 100
SRC_HC_OPTS += -package parallel
SRC_DEPS = parallel
# FAST_OPTS =
# NORM_OPTS =
......
TOP = ../..
include $(TOP)/mk/boilerplate.mk
SRC_HC_OPTS += -cpp -DSTRATEGIES -DTRANSCL_NESTED -package random -package parallel -package containers
SRC_HC_OPTS += -cpp -DSTRATEGIES -DTRANSCL_NESTED
SRC_DEPS = random parallel containers
# XXX: only speeds up without optimisation. This is bad. Could be
# due to the nfib delay mucking up load-balancing.
......
......@@ -14,6 +14,6 @@ TOP = ../..
include $(TOP)/mk/boilerplate.mk
SRC_RUNTEST_OPTS += 400 400
SRC_HC_OPTS += -package parallel
SRC_DEPS = parallel
include $(TOP)/mk/target.mk
TOP = ../../..
include $(TOP)/mk/boilerplate.mk
SRC_HC_OPTS += -fglasgow-exts -package transformers
SRC_HC_OPTS += -fglasgow-exts
SRC_DEPS = transformers
include $(TOP)/mk/target.mk
TOP = ../../..
include $(TOP)/mk/boilerplate.mk
SRC_HC_OPTS += -fglasgow-exts -package transformers -package mtl
SRC_HC_OPTS += -fglasgow-exts
SRC_DEPS = transformers mtl
include $(TOP)/mk/target.mk
TOP = ../../..
include $(TOP)/mk/boilerplate.mk
SRC_HC_OPTS += -fglasgow-exts -package transformers
SRC_HC_OPTS += -fglasgow-exts
SRC_DEPS = transformers
include $(TOP)/mk/target.mk
TOP = ../../..
include $(TOP)/mk/boilerplate.mk
SRC_HC_OPTS += -fglasgow-exts -package transformers -package mtl
SRC_HC_OPTS += -fglasgow-exts
SRC_DEPS = transformers mtl
include $(TOP)/mk/target.mk
TOP = ../../..
include $(TOP)/mk/boilerplate.mk
SRC_HC_OPTS += -fglasgow-exts -package transformers -package mtl
SRC_HC_OPTS += -fglasgow-exts
SRC_DEPS = transformers mtl
include $(TOP)/mk/target.mk
......@@ -13,7 +13,7 @@ SLOW_OPTS = 25000000 # official shootout setting
# The benchmark game also uses -fllvm, which we can't since it might
# not be available on the developer's machine.
HC_OPTS += -package bytestring
SRC_DEPS = bytestring
#------------------------------------------------------------------
# Create output to validate against
......
......@@ -14,7 +14,7 @@ CLEAN_FILES += fasta-c k-nucleotide.*stdin
# The benchmark game also uses -fllvm, which we can't since it might
# not be available on the developer's machine.
HC_OPTS += -package bytestring
SRC_DEPS = bytestring
#------------------------------------------------------------------
# Create input
......
......@@ -5,6 +5,6 @@ FAST_OPTS = 10
NORM_OPTS = 100
SLOW_OPTS = 500
SRC_HC_OPTS += -package old-time
SRC_DEPS = old-time
include $(TOP)/mk/target.mk
TOP = ../..
include $(TOP)/mk/boilerplate.mk
SRC_HC_OPTS += -package stm
SRC_DEPS = stm
include $(TOP)/mk/target.mk
......@@ -5,6 +5,6 @@ FAST_OPTS = 100000
NORM_OPTS = 5000000
SLOW_OPTS = 50000000
SRC_HC_OPTS += -package stm
SRC_DEPS = stm
include $(TOP)/mk/target.mk
......@@ -3,7 +3,7 @@ include $(TOP)/mk/boilerplate.mk
include $(TOP)/mk/target.mk
SRC_HC_OPTS += -package transformers
SRC_DEPS = transformers
FAST_OPTS = 30
NORM_OPTS = 300
......
......@@ -13,5 +13,4 @@ FAST_OPTS = ghc-examples.in 50
NORM_OPTS = ghc-examples.in 400
SLOW_OPTS = ghc-examples.in 1800
# We require containers.
HC_OPTS += -package containers
SRC_DEPS = containers
TOP = ../..
include $(TOP)/mk/boilerplate.mk
SRC_HC_OPTS += -package array
SRC_DEPS = array
FAST_OPTS = 500
NORM_OPTS = 3500
......
TOP = ../..
include $(TOP)/mk/boilerplate.mk
SRC_HC_OPTS += -package transformers
SRC_DEPS = transformers
include $(TOP)/mk/target.mk
......
TOP = ../..
include $(TOP)/mk/boilerplate.mk
SRC_HC_OPTS += -package containers -package pretty
SRC_DEPS = containers pretty
include $(TOP)/mk/target.mk
TOP = ../..
include $(TOP)/mk/boilerplate.mk
-include opts.mk
SRC_HC_OPTS += -package random
SRC_DEPS = random
include $(TOP)/mk/target.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