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
ebef9be4
Commit
ebef9be4
authored
Jun 25, 2011
by
Ian Lynagh
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Rename STAGE0_PACKAGES to PACKAGES_STAGE0
It now matches PACKAGES_STAGE2
parent
632f2b29
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
11 deletions
+11
-11
boot
boot
+1
-1
ghc.mk
ghc.mk
+10
-10
No files found.
boot
View file @
ebef9be4
...
...
@@ -174,7 +174,7 @@ sub boot_pkgs {
or
die
"
Opening
$package
/ghc.mk failed: $!
";
print
GHCMK
"
${package}
_PACKAGE =
${pkg}
\n
";
print
GHCMK
"
${package}
_dist-install_GROUP = libraries
\n
";
print
GHCMK
"
\$
(if
\$
(filter
${dir}
,
\$
(
STAGE0_PACKAGES
)),
\$
(eval
\$
(call build-package,
${package}
,dist-boot,0)))
\n
";
print
GHCMK
"
\$
(if
\$
(filter
${dir}
,
\$
(
PACKAGES_STAGE0
)),
\$
(eval
\$
(call build-package,
${package}
,dist-boot,0)))
\n
";
print
GHCMK
"
\$
(eval
\$
(call build-package,
${package}
,dist-install,
\$
(if
\$
(filter
${dir}
,
\$
(STAGE2_PACKAGES)),2,1)))
\n
";
close
GHCMK
or
die
"
Closing
$package
/ghc.mk failed: $!
";
...
...
ghc.mk
View file @
ebef9be4
...
...
@@ -313,7 +313,7 @@ TH_PACKAGES := $(DPH_PACKAGES)
#
# We assume that the stage0 compiler has a suitable bytestring package,
# so we don't have to include it below.
STAGE0_PACKAGES
=
Cabal/cabal hpc extensible-exceptions binary bin-package-db hoopl
PACKAGES_STAGE0
=
Cabal/cabal hpc extensible-exceptions binary bin-package-db hoopl
# These packages are installed, but are installed hidden
# Why install them at all? Because the 'ghc' package depends on them
...
...
@@ -330,8 +330,8 @@ HIDDEN_PACKAGES = binary
# Packages to build
# The lists of packages that we *actually* going to build in each stage:
#
# $(
STAGE0_PACKAGE)
does double duty; it really is the list of packages
#
we build the bootstrap compiler in stage 0
# $(
PACKAGES_STAGE0)
does double duty; it really is the list of packages
#
we build the bootstrap compiler in stage 0
#
# $(PACKAGES) A list of directories relative to libraries/ containing
# packages that will be built by stage1, in dependency
...
...
@@ -457,7 +457,7 @@ endif
# Misc package-related settings
BOOT_PKG_CONSTRAINTS
:=
\
$(
foreach
d,
$(
STAGE0_PACKAGES
)
,
\
$(
foreach
d,
$(
PACKAGES_STAGE0
)
,
\
$(
foreach
p,
$(
basename
$(
notdir
$(
wildcard
libraries/
$d
/
*
.cabal
)))
,
\
--constraint
"
$p
==
$(
shell
grep -i "
^Version:
" libraries/
$d
/
$p
.cabal | sed "
s/[^0-9.]//g
"
)
"
))
...
...
@@ -466,7 +466,7 @@ ALL_STAGE1_LIBS = $(foreach lib,$(PACKAGES),$(libraries/$(lib)_dist-install_v_L
ifeq
"$(BuildSharedLibs)" "YES"
ALL_STAGE1_LIBS
+=
$(
foreach
lib,
$(PACKAGES)
,
$
(
libraries/
$(lib)
_dist-install_dyn_LIB
))
endif
BOOT_LIBS
=
$(
foreach
lib,
$(
STAGE0_PACKAGES
)
,
$
(
libraries/
$(lib)
_dist-boot_v_LIB
))
BOOT_LIBS
=
$(
foreach
lib,
$(
PACKAGES_STAGE0
)
,
$
(
libraries/
$(lib)
_dist-boot_v_LIB
))
OTHER_LIBS
=
libffi/dist-install/build/libHSffi
$(v_libsuf)
libffi/dist-install/build/HSffi.o
ifeq
"$(BuildSharedLibs)" "YES"
...
...
@@ -637,7 +637,7 @@ stage1_libs : $(ALL_STAGE1_LIBS)
$(foreach
pkg,$(PACKAGES)
$(PACKAGES_STAGE2),$(eval
libraries/
$(pkg)_dist-install_HC_OPTS
+=
$
$(GhcLibHcOpts)
))
# Add $(GhcBootLibHcOpts) to all stage0 package builds
$(foreach
pkg,$(
STAGE0_PACKAGES
),$(eval
libraries/
$(pkg)_dist-boot_HC_OPTS
+=
$
$(GhcBootLibHcOpts)
))
$(foreach
pkg,$(
PACKAGES_STAGE0
),$(eval
libraries/
$(pkg)_dist-boot_HC_OPTS
+=
$
$(GhcBootLibHcOpts)
))
# -----------------------------------------------
# Haddock-related bits
...
...
@@ -645,7 +645,7 @@ $(foreach pkg,$(STAGE0_PACKAGES),$(eval libraries/$(pkg)_dist-boot_HC_OPTS += $$
# Don't run Haddock for the package that will not be installed
$(foreach
p,$(INTREE_ONLY_PACKAGES),$(eval
libraries/
$p_dist-install_DO_HADDOCK
=
NO
))
# We don't haddock the bootstrapping libraries
$(foreach
p,$(
STAGE0_PACKAGES
),$(eval
libraries/
$p_dist-boot_DO_HADDOCK
=
NO
))
$(foreach
p,$(
PACKAGES_STAGE0
),$(eval
libraries/
$p_dist-boot_DO_HADDOCK
=
NO
))
# Build the Haddock contents and index
ifeq
"$(HADDOCK_DOCS)" "YES"
...
...
@@ -679,7 +679,7 @@ $(eval $(call clean-target,$(BOOTSTRAPPING_CONF),,$(BOOTSTRAPPING_CONF)))
# multiple ghc-pkgs in parallel doesn't work (registrations may get
# lost).
fixed_pkg_prev
=
$(foreach
pkg,$(
STAGE0_PACKAGES
),$(eval
$(call
fixed_pkg_dep,$(pkg),dist-boot)))
$(foreach
pkg,$(
PACKAGES_STAGE0
),$(eval
$(call
fixed_pkg_dep,$(pkg),dist-boot)))
compiler/stage1/package-data.mk
:
$(fixed_pkg_prev)
endif
...
...
@@ -1131,7 +1131,7 @@ clean_files :
.PHONY
:
clean_libraries
clean_libraries
:
$(patsubst %
,
clean_libraries/%_dist-install
,
$(PACKAGES) $(PACKAGES_STAGE2))
clean_libraries
:
$(patsubst %
,
clean_libraries/%_dist-boot
,
$(
STAGE0_PACKAGES
))
clean_libraries
:
$(patsubst %
,
clean_libraries/%_dist-boot
,
$(
PACKAGES_STAGE0
))
clean_libraries
:
"
$(RM)
"
$(RM_OPTS_REC)
$(
patsubst
%, libraries/%/dist,
$(PACKAGES)
$(PACKAGES_STAGE2)
)
...
...
@@ -1140,7 +1140,7 @@ clean_libraries:
# We have to define a clean target for each library manually, because the
# libraries/*/ghc.mk files are not included when we're cleaning.
ifeq
"$(CLEANING)" "YES"
$(foreach
lib,$(
STAGE0_PACKAGES
),\
$(foreach
lib,$(
PACKAGES_STAGE0
),\
$(eval
$(call
clean-target,libraries/$(lib),dist-boot,libraries/$(lib)/dist-boot)))
$(foreach
lib,$(PACKAGES)
$(PACKAGES_STAGE2),\
$(eval
$(call
clean-target,libraries/$(lib),dist-install,libraries/$(lib)/dist-install)))
...
...
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