Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
Alex D
GHC
Commits
f1368057
Commit
f1368057
authored
Feb 21, 2013
by
ian@well-typed.com
Browse files
Separate the non-way-specific hs-suffix rules
This means we don't define them multiple times
parent
0565f88e
Changes
5
Hide whitespace changes
Inline
Side-by-side
ghc.mk
View file @
f1368057
...
...
@@ -227,6 +227,7 @@ include rules/cmm-objs.mk
# so we don't make any when cleaning.
ifneq
"$(CLEANING)" "YES"
include
rules/hs-suffix-rules-srcdir.mk
include
rules/hs-suffix-way-rules-srcdir.mk
include
rules/hs-suffix-way-rules.mk
include
rules/hi-rule.mk
...
...
rules/build-package.mk
View file @
f1368057
...
...
@@ -131,6 +131,8 @@ ifeq "$$(BuildSharedLibs)" "YES"
$(call
c-objs,$1,$2,dyn)
$(call
c-suffix-rules,$1,$2,dyn,YES)
endif
$$(foreach
dir,$$($1_$2_HS_SRC_DIRS),\
$$(eval
$$(call
hs-suffix-rules-srcdir,$1,$2,$$(dir))))
$(call
all-target,$1,all_$1_$2)
# This give us things like
...
...
rules/build-prog.mk
View file @
f1368057
...
...
@@ -155,6 +155,8 @@ $(call c-suffix-rules,$1,$2,$$($1_$2_PROGRAM_WAY),NO)
endif
endif
$$(foreach
dir,$$($1_$2_HS_SRC_DIRS),\
$$(eval
$$(call
hs-suffix-rules-srcdir,$1,$2,$$(dir))))
$(call
hs-suffix-way-rules,$1,$2,$$($1_$2_PROGRAM_WAY))
$(call
c-objs,$1,$2,$$($1_$2_PROGRAM_WAY))
...
...
rules/hs-suffix-rules-srcdir.mk
0 → 100644
View file @
f1368057
# -----------------------------------------------------------------------------
#
# (c) 2009 The University of Glasgow
#
# This file is part of the GHC build system.
#
# To understand how the build system works and how to modify it, see
# http://hackage.haskell.org/trac/ghc/wiki/Building/Architecture
# http://hackage.haskell.org/trac/ghc/wiki/Building/Modifying
#
# -----------------------------------------------------------------------------
define
hs-suffix-rules-srcdir
# args: $1 = dir, $2 = distdir, $3 = srcdir
# Preprocessing Haskell source
ifneq
"$$(BINDIST)" "YES"
$1/$2/build/%.hs
:
$1/$3/%.ly | $$$$(dir $$$$@)/.
$
$(
call
cmd,HAPPY
)
$$
(
$1_$2_ALL_HAPPY_OPTS
)
$$
<
-o
$$
@
$1/$2/build/%.hs
:
$1/$3/%.y | $$$$(dir $$$$@)/.
$
$(
call
cmd,HAPPY
)
$$
(
$1_$2_ALL_HAPPY_OPTS
)
$$
<
-o
$$
@
$1/$2/build/%.hs
:
$1/$2/build/%.ly | $$$$(dir $$$$@)/.
$
$(
call
cmd,HAPPY
)
$$
(
$1_$2_ALL_HAPPY_OPTS
)
$$
<
-o
$$
@
$1/$2/build/%.hs
:
$1/$2/build/%.y | $$$$(dir $$$$@)/.
$
$(
call
cmd,HAPPY
)
$$
(
$1_$2_ALL_HAPPY_OPTS
)
$$
<
-o
$$
@
$1/$2/build/%.hs
:
$1/$3/%.x | $$$$(dir $$$$@)/.
$
$(
call
cmd,ALEX
)
$$
(
$1_$2_ALL_ALEX_OPTS
)
$$
<
-o
$$
@
$1/$2/build/%_hsc.c $1/$2/build/%_hsc.h $1/$2/build/%.hs
:
$1/$3/%.hsc $$(HSC2HS_INPLACE) | $$$$(dir $$$$@)/.
$
$(
call
cmd,HSC2HS_INPLACE
)
$$
(
$1_$2_ALL_HSC2HS_OPTS
)
$$
<
-o
$$
@
# Now the rules for hs-boot files.
$1/$2/build/%.hs-boot
:
$1/$3/%.hs-boot
"
$
$(CP)
"
$$
<
$$
@
$1/$2/build/%.lhs-boot
:
$1/$3/%.lhs-boot
"
$
$(CP)
"
$$
<
$$
@
endif
endef
rules/hs-suffix-way-rules-srcdir.mk
View file @
f1368057
...
...
@@ -14,28 +14,8 @@
define
hs-suffix-way-rules-srcdir
# args: $1 = dir, $2 = distdir, $3 = way, $4 = srcdir
# Preprocessing Haskell source
ifneq
"$$(BINDIST)" "YES"
$1/$2/build/%.hs
:
$1/$4/%.ly | $$$$(dir $$$$@)/.
$
$(
call
cmd,HAPPY
)
$$
(
$1_$2_ALL_HAPPY_OPTS
)
$$
<
-o
$$
@
$1/$2/build/%.hs
:
$1/$4/%.y | $$$$(dir $$$$@)/.
$
$(
call
cmd,HAPPY
)
$$
(
$1_$2_ALL_HAPPY_OPTS
)
$$
<
-o
$$
@
$1/$2/build/%.hs
:
$1/$2/build/%.ly | $$$$(dir $$$$@)/.
$
$(
call
cmd,HAPPY
)
$$
(
$1_$2_ALL_HAPPY_OPTS
)
$$
<
-o
$$
@
$1/$2/build/%.hs
:
$1/$2/build/%.y | $$$$(dir $$$$@)/.
$
$(
call
cmd,HAPPY
)
$$
(
$1_$2_ALL_HAPPY_OPTS
)
$$
<
-o
$$
@
$1/$2/build/%.hs
:
$1/$4/%.x | $$$$(dir $$$$@)/.
$
$(
call
cmd,ALEX
)
$$
(
$1_$2_ALL_ALEX_OPTS
)
$$
<
-o
$$
@
$1/$2/build/%_hsc.c $1/$2/build/%_hsc.h $1/$2/build/%.hs
:
$1/$4/%.hsc $$(HSC2HS_INPLACE) | $$$$(dir $$$$@)/.
$
$(
call
cmd,HSC2HS_INPLACE
)
$$
(
$1_$2_ALL_HSC2HS_OPTS
)
$$
<
-o
$$
@
# Compiling Haskell source
$1/$2/build/%.$$($3_osuf)
:
$1/$4/%.hs $$(LAX_DEPS_FOLLOW) $$($1_$2_HC_DEP) $$($1_$2_PKGDATA_DEP)
...
...
@@ -70,12 +50,6 @@ $1/$2/build/%.$$($3_osuf) : $1/$2/build/%.hc includes/ghcautoconf.h includes/ghc
# Now the rules for hs-boot files.
$1/$2/build/%.hs-boot
:
$1/$4/%.hs-boot
"
$
$(CP)
"
$$
<
$$
@
$1/$2/build/%.lhs-boot
:
$1/$4/%.lhs-boot
"
$
$(CP)
"
$$
<
$$
@
$1/$2/build/%.$$($3_way_)o-boot
:
$1/$4/%.hs-boot $$(LAX_DEPS_FOLLOW) $$($1_$2_HC_DEP) $$($1_$2_PKGDATA_DEP)
$
$(
call
cmd,
$1_$2_HC
)
$$
(
$1_$2_$3_ALL_HC_OPTS
)
-c
$$
<
-o
$$
@
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment