Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Open sidebar
Alex D
GHC
Commits
72995160
Commit
72995160
authored
Jan 25, 2013
by
Simon Marlow
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix various issues with a Stage1Only=NO cross-compile
parent
3c9d6304
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
9 deletions
+8
-9
ghc.mk
ghc.mk
+8
-9
No files found.
ghc.mk
View file @
72995160
...
...
@@ -338,8 +338,11 @@ PKGS_THAT_ARE_DPH := \
# Packages that, if present, must be built by the stage2 compiler,
# because they use TH and/or annotations, or depend on other stage2
# packages:
PKGS_THAT_BUILD_WITH_STAGE2
:=
\
$(PKGS_THAT_ARE_DPH)
old-time haskell98 haskell2010
PKGS_THAT_BUILD_WITH_STAGE2
:=
$(PKGS_THAT_ARE_DPH)
ifeq
"$(CrossCompiling)" "NO"
# We cannot use the stage 2 compiler, it runs on $(TARGETPLATFORM)
PKGS_THAT_BUILD_WITH_STAGE2
+=
old-time haskell98 haskell2010
endif
# Packages that we shouldn't build if we don't have TH (e.g. because
# we're building a profiled compiler):
...
...
@@ -397,9 +400,7 @@ endef
define addPackage # args
:
$1 = package
,
$2 = condition
ifneq
"$(filter $1,$(PKGS_THAT_USE_TH)) $(GhcProfiled)" "$1 YES"
ifeq
"$(filter $1,$(PKGS_THAT_BUILD_WITH_STAGE2))" "$1"
ifneq
"$(Stage1Only)" "YES"
$(call
addPackageGeneral,PACKAGES_STAGE2,$1,$2)
endif
else
$(call
addPackageGeneral,PACKAGES_STAGE1,$1,$2)
endif
...
...
@@ -640,13 +641,11 @@ else ifneq "$(findstring clean,$(MAKECMDGOALS))" ""
BUILD_DIRS
+=
libraries/integer-gmp/gmp
endif
ifeq
"$(Stage1Only)-$(phase)" "YES-final"
MAYBE_COMPILER
=
ifeq
"$(CrossCompiling)-$(phase)" "YES-final"
MAYBE_GHCTAGS
=
MAYBE_HPC
=
MAYBE_RUNGHC
=
else
MAYBE_COMPILER
=
compiler
MAYBE_GHCTAGS
=
utils/ghctags
MAYBE_HPC
=
utils/hpc
MAYBE_RUNGHC
=
utils/runghc
...
...
@@ -655,7 +654,7 @@ endif
BUILD_DIRS
+=
\
utils/haddock
\
utils/haddock/doc
\
$(MAYBE_COMPILER)
\
compiler
\
$(GHC_HSC2HS_DIR)
\
$(GHC_PKG_DIR)
\
utils/deriveConstants
\
...
...
@@ -668,7 +667,7 @@ BUILD_DIRS += \
ghc
ifneq
"$(BINDIST)" "YES"
ifneq
"$(
Stage1Only
)-$(phase)" "YES-final"
ifneq
"$(
CrossCompiling
)-$(phase)" "YES-final"
BUILD_DIRS
+=
\
utils/mkUserGuidePart
endif
...
...
Write
Preview
Markdown
is supported
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