Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
Shayne Fletcher
Glasgow Haskell Compiler
Commits
02856df2
Commit
02856df2
authored
Oct 20, 2010
by
Ian Lynagh
Browse files
Look for sources in Cabal's autogen directory too
parent
351f4d42
Changes
1
Hide whitespace changes
Inline
Side-by-side
rules/hs-sources.mk
View file @
02856df2
...
...
@@ -26,11 +26,11 @@ endif
# NB. use :=, we only want this thing evaluated once.
#
$1_$2_HS_SRCS
:=
$
$(
foreach
file,
$$
(
$1_$2_SLASH_MODS
)
,
\
$
$(
firstword
\
$
$(
wildcard
\
$
$(
foreach
dir
,
$$
(
$1_$2_HS_SRC_DIRS
)
,
\
$1
/
$
$(dir)
/
$
$(file)
.hs
$1
/
$
$(dir)
/
$
$(file)
.lhs
))
\
$1
/
$2
/build/
$
$(file)
.hs
))
$
$(
firstword
\
$
$(
wildcard
\
$
$(
foreach
dir
,
$$
(
$1_$2_HS_SRC_DIRS
)
$2
/build/autogen
,
\
$1
/
$
$(dir)
/
$
$(file)
.hs
$1
/
$
$(dir)
/
$
$(file)
.lhs
))
\
$1
/
$2
/build/
$
$(file)
.hs
))
# .hs-boot files must be in the same place as the .hs file they go
# with (GHC assumes this). When we preprocess a source file, and
...
...
@@ -47,12 +47,12 @@ $1_$2_HS_SRCS := $$(foreach file,$$($1_$2_SLASH_MODS),\
# NB. use :=, we only want this thing evaluated once.
#
$1_$2_HS_BOOT_SRCS
:=
$
$(
foreach
dir
,
$$
(
$1_$2_HS_SRC_DIRS
)
,
\
$
$(
subst
$1
/
$
$(dir)
,
$1
/
$2
/build,
\
$
$(
wildcard
\
$
$(
subst
$1
/
$2
/build,
$1
/
$
$(dir)
,
\
$
$(
foreach
file,
\
$
$(
filter
$1
/
$2
/build%,
$$
(
$1_$2_HS_SRCS
))
,
\
$
$(
patsubst
%.hs,%.hs-boot,
$
$(file)
)
\
$
$(
patsubst
%.hs,%.lhs-boot,
$
$(file)
))))))
$
$(
subst
$1
/
$
$(dir)
,
$1
/
$2
/build,
\
$
$(
wildcard
\
$
$(
subst
$1
/
$2
/build,
$1
/
$
$(dir)
,
\
$
$(
foreach
file,
\
$
$(
filter
$1
/
$2
/build%,
$$
(
$1_$2_HS_SRCS
))
,
\
$
$(
patsubst
%.hs,%.hs-boot,
$
$(file)
)
\
$
$(
patsubst
%.hs,%.lhs-boot,
$
$(file)
))))))
endef
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a 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