Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
GHC
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Iterations
Merge Requests
0
Merge Requests
0
Requirements
Requirements
List
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Package Registry
Container Registry
Analytics
Analytics
CI / CD
Code Review
Insights
Issue
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Alex D
GHC
Commits
ac77a1eb
Commit
ac77a1eb
authored
Jan 16, 2011
by
Ian Lynagh
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove an unnecessary phase, and some unnecessary deps
now that cross-package deps are tracked correctly.
parent
421b8ced
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
19 additions
and
49 deletions
+19
-49
Makefile
Makefile
+0
-4
ghc.mk
ghc.mk
+19
-45
No files found.
Makefile
View file @
ac77a1eb
...
...
@@ -73,10 +73,6 @@ endif
ifneq
"$(OMIT_PHASE_3)" "YES"
@
echo
"===--- building phase 3"
$(MAKE)
-r
--no-print-directory
-f
ghc.mk
phase
=
3 all
endif
ifneq
"$(OMIT_PHASE_4)" "YES"
@
echo
"===--- building phase 4"
$(MAKE)
-r
--no-print-directory
-f
ghc.mk
phase
=
4 all
endif
@
echo
"===--- building final phase"
$(MAKE)
-r
--no-print-directory
-f
ghc.mk
$@
...
...
ghc.mk
View file @
ac77a1eb
...
...
@@ -621,10 +621,6 @@ phase_3_or_later = YES
endif
ifeq
"$(findstring $(phase),0 1 2 3)" ""
phase_3_done
=
YES
phase_4_or_later
=
YES
endif
ifeq
"$(findstring $(phase),0 1 2 3 4)" ""
phase_4_done
=
YES
endif
includes_dist-derivedconstants_CONFIGURE_PHASE
=
0
...
...
@@ -640,39 +636,31 @@ utils/genprimopcode_dist_CONFIGURE_PHASE = 0
# Then the bootlibs
$(foreach
lib,$(STAGE0_PACKAGES),$(eval
\
libraries/
$(lib)_dist-boot_CONFIGURE_PHASE
=
1
))
compiler_stage1_CONFIGURE_PHASE
=
1
ghc_stage1_CONFIGURE_PHASE
=
1
# We put the stage 1 compiler package in a later phase than the bootlibs
# for the same reasone we have the
# $(compiler_stage1_depfile_haskell) : $(BOOT_LIBS)
# dependency below
compiler_stage1_CONFIGURE_PHASE
=
2
# Now we make the stage 1 compiler binary. Again, in a later phase than
# its package for the same reason as the
# $(ghc_stage1_depfile_haskell) : $(compiler_stage1_v_LIB)
# dep below
ghc_stage1_CONFIGURE_PHASE
=
3
# In phase 2, the phase 1 things actually get built
# Finally, the stage1 compiler is used to make the dependencies for
# everything else, so we can now build the rest.
compiler_stage2_CONFIGURE_PHASE
=
4
ghc_stage2_CONFIGURE_PHASE
=
4
compiler_stage2_CONFIGURE_PHASE
=
3
ghc_stage2_CONFIGURE_PHASE
=
3
$(foreach
lib,$(PACKAGES)
$(PACKAGES_STAGE2),$(eval
\
libraries/
$(lib)_dist-install_CONFIGURE_PHASE
=
4
))
utils/
hp2ps_dist_CONFIGURE_PHASE
=
4
utils/
genapply_dist_CONFIGURE_PHASE
=
4
utils/
haddock_dist_CONFIGURE_PHASE
=
4
utils/
hsc2hs_dist-install_CONFIGURE_PHASE
=
4
utils/
ghc-pkg_dist-install_CONFIGURE_PHASE
=
4
utils/
hpc_dist_CONFIGURE_PHASE
=
4
utils/
runghc_dist_CONFIGURE_PHASE
=
4
utils/
ghctags_dist_CONFIGURE_PHASE
=
4
utils/
ghc-pwd_dist_CONFIGURE_PHASE
=
4
utils/
ghc-cabal_dist-install_CONFIGURE_PHASE
=
4
utils/
mkUserGuidePart_dist_CONFIGURE_PHASE
=
4
utils/
compare_sizes_dist_CONFIGURE_PHASE
=
4
libraries/
$(lib)_dist-install_CONFIGURE_PHASE
=
3
))
utils/
hp2ps_dist_CONFIGURE_PHASE
=
3
utils/
genapply_dist_CONFIGURE_PHASE
=
3
utils/
haddock_dist_CONFIGURE_PHASE
=
3
utils/
hsc2hs_dist-install_CONFIGURE_PHASE
=
3
utils/
ghc-pkg_dist-install_CONFIGURE_PHASE
=
3
utils/
hpc_dist_CONFIGURE_PHASE
=
3
utils/
runghc_dist_CONFIGURE_PHASE
=
3
utils/
ghctags_dist_CONFIGURE_PHASE
=
3
utils/
ghc-pwd_dist_CONFIGURE_PHASE
=
3
utils/
ghc-cabal_dist-install_CONFIGURE_PHASE
=
3
utils/
mkUserGuidePart_dist_CONFIGURE_PHASE
=
3
utils/
compare_sizes_dist_CONFIGURE_PHASE
=
3
# ----------------------------------------------
# Actually include all the sub-ghc.mk's
...
...
@@ -756,20 +744,6 @@ compiler/stage1/package-data.mk : \
libraries/extensible-exceptions/dist-boot/package-data.mk
\
libraries/bin-package-db/dist-boot/package-data.mk
# These are necessary because the bootstrapping compiler may not know
# about cross-package dependencies:
$(compiler_stage1_depfile_haskell)
:
$(BOOT_LIBS)
$(ghc_stage1_depfile_haskell)
:
$(compiler_stage1_v_LIB)
# A few careful dependencies between bootstrapping packages. When we
# can rely on the stage 0 compiler being able to generate
# cross-package dependencies with -M (fixed in GHC 6.12.1) we can drop
# these, and also some of the phases.
#
# If you miss any out here, then 'make -j8' will probably tell you.
#
libraries/bin-package-db/dist-boot/build/Distribution/InstalledPackageInfo/Binary.$(v_osuf)
:
libraries/binary/dist-boot/build/Data/Binary.$(v_hisuf) libraries/Cabal/dist-boot/build/Distribution/InstalledPackageInfo.$(v_hisuf)
# Make sure we have all the GHCi libs by the time we've built
# ghc-stage2. DPH includes a bit of Template Haskell which needs the
# GHCI libs, and we don't have a better way to express that dependency.
...
...
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