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
Alex D
GHC
Commits
94949948
Commit
94949948
authored
Aug 25, 2010
by
simonpj@microsoft.com
Browse files
Fix the DPH/profiled make thing (again)
parent
89c56230
Changes
1
Hide whitespace changes
Inline
Side-by-side
ghc.mk
View file @
94949948
...
...
@@ -349,20 +349,28 @@ $(eval $(call addPackage,haskeline))
$(foreach
pkg,$(EXTRA_PACKAGES),$(eval
$(call
addPackage,$(pkg))))
ifneq
"$(BootingFromHc)" "YES"
ifneq
"$(GhcProfiled)" "YES"
# DPH uses Template Haskell, and Template Haskell doesn't work
# with a profiled compiler. So if stage-2 is profile, don't build DPH
PACKAGES_STAGE2
+=
\
dph/dph-base
\
# ------------------- Adding DPH packaes ---------------
DPH_PACKAGES
=
dph/dph-base
\
dph/dph-prim-interface
\
dph/dph-prim-seq
\
dph/dph-prim-par
\
dph/dph-seq
\
dph/dph-par
endif
endif
ifneq
"$(BootingFromHc)" "YES"
ifeq
"$(CLEANING)" "YES"
# If we are cleaning we must add DPH packages regardless,
# for reasons we now forget
PACKAGES_STAGE2
+=
$(DPH_PACKAGES)
else
# not CLEANING
ifneq
"$(GhcProfiled)" "YES"
# DPH uses Template Haskell, and Template Haskell doesn't work
# with a profiled compiler. So if stage-2 is profile, don't build DPH
PACKAGES_STAGE2
+=
$(DPH_PACKAGES)
endif
# GhcProfiled
endif
# Cleaning
endif
# BootingFromHc
# -------------------------------------------------------
# We assume that the stage0 compiler has a suitable bytestring package,
# so we don't have to include it below.
...
...
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