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
24adfcd0
Commit
24adfcd0
authored
May 13, 2009
by
Ian Lynagh
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix building dph in the new build system
parent
9a4ef343
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
19 additions
and
13 deletions
+19
-13
ghc.mk
ghc.mk
+15
-9
rules/build-prog.mk
rules/build-prog.mk
+4
-4
No files found.
ghc.mk
View file @
24adfcd0
...
...
@@ -316,7 +316,7 @@ endif
PACKAGES
+=
haskeline
ifneq
"$(wildcard libraries/dph)" ""
PACKAGES
+=
\
PACKAGES
_STAGE2
+=
\
dph/dph-base
\
dph/dph-prim-interface
\
dph/dph-prim-seq
\
...
...
@@ -328,9 +328,9 @@ endif
BOOT_PKGS
=
Cabal hpc extensible-exceptions
# The actual .a and .so/.dll files: needed for dependencies.
ALL_LIBS
=
$(
foreach
lib,
$(PACKAGES)
,
$
(
libraries/
$(lib)
_dist-install_v_LIB
))
ALL_
STAGE1_
LIBS
=
$(
foreach
lib,
$(PACKAGES)
,
$
(
libraries/
$(lib)
_dist-install_v_LIB
))
ifeq
"$(BuildSharedLibs)" "YES"
ALL_LIBS
+=
$(
foreach
lib,
$(PACKAGES)
,
$
(
libraries/
$(lib)
_dist-install_dyn_LIB
))
ALL_
STAGE1_
LIBS
+=
$(
foreach
lib,
$(PACKAGES)
,
$
(
libraries/
$(lib)
_dist-install_dyn_LIB
))
endif
BOOT_LIBS
=
$(
foreach
lib,
$(BOOT_PKGS)
,
$
(
libraries/
$(lib)
_dist-boot_v_LIB
))
...
...
@@ -350,18 +350,20 @@ endif
# know the dependencies until we've generated the pacakge-data.mk
# files.
define
fixed_pkg_dep
libraries/$1/$2/package-data.mk
:
$(GHC_PKG_INPLACE) $$(if $$(fixed_pkg_prev)
,
libraries/$$(fixed_pkg_prev)/$2/package-data.mk)
libraries/$1/$2/package-data.mk
:
$
$
(GHC_PKG_INPLACE) $$(if $$(fixed_pkg_prev)
,
libraries/$$(fixed_pkg_prev)/$2/package-data.mk)
fixed_pkg_prev
:=
$1
endef
ifneq
"$(BINDIST)" "YES"
fixed_pkg_prev
=
$(foreach
pkg,$(PACKAGES),$(eval
$(call
fixed_pkg_dep,$(pkg),dist-install)))
$(foreach
pkg,$(PACKAGES)
$(PACKAGES_STAGE2)
,$(eval
$(call
fixed_pkg_dep,$(pkg),dist-install)))
# We assume that the stage2 compiler depends on all the libraries, so
# they all get added to the package database before we try to configure
# it
compiler/stage2/package-data.mk
:
$(foreach pkg
,
$(PACKAGES)
,
libraries/$(pkg)/dist-install/package-data.mk)
compiler/stage2/package-data.mk
:
$(foreach pkg
,
$(PACKAGES) $(PACKAGES_STAGE2)
,
libraries/$(pkg)/dist-install/package-data.mk)
ghc/stage1/package-data.mk
:
compiler/stage1/package-data.mk
ghc/stage2/package-data.mk
:
compiler/stage2/package-data.mk
# haddock depends on ghc and some libraries, but depending on GHC's
# package-data.mk is sufficient, as that in turn depends on all the
# libraries
...
...
@@ -480,6 +482,7 @@ BUILD_DIRS += \
utils/haddock
\
utils/haddock/doc
\
$(
patsubst
%, libraries/%,
$(PACKAGES)
)
\
$(
patsubst
%, libraries/%,
$(PACKAGES_STAGE2)
)
\
compiler
\
$(GHC_HSC2HS_DIR)
\
$(GHC_PKG_DIR)
\
...
...
@@ -521,7 +524,7 @@ compiler_stage2_DISABLE = YES
compiler_stage3_DISABLE
=
YES
ghc_stage2_DISABLE
=
YES
ghc_stage3_DISABLE
=
YES
$(foreach
lib,$(PACKAGES),$(eval
\
$(foreach
lib,$(PACKAGES)
$(PACKAGES_STAGE2)
,$(eval
\
libraries/
$(lib)_dist-install_DISABLE
=
YES
))
endif
...
...
@@ -537,7 +540,10 @@ GhcBootLibHcOpts += -fno-warn-deprecated-flags
endif
# Add $(GhcLibHcOpts) to all library builds
$(foreach
pkg,$(PACKAGES),$(eval
libraries/
$(pkg)_dist-install_HC_OPTS
+=
$
$(GhcLibHcOpts)
))
$(foreach
pkg,$(PACKAGES)
$(PACKAGES_STAGE2),$(eval
libraries/
$(pkg)_dist-install_HC_OPTS
+=
$
$(GhcLibHcOpts)
))
# XXX Hack; remove this
$(foreach
pkg,$(PACKAGES_STAGE2),$(eval
libraries/
$(pkg)_dist-install_HC_OPTS
+=
-Wwarn
))
# XXX we configure packages with the bootsrapping compiler (for
# dependency reasons, see the phase ordering), which doesn't
...
...
@@ -695,7 +701,7 @@ install_packages: libffi/package.conf.install rts/package.conf.install
echo
"[]"
>
$(INSTALLED_PACKAGE_CONF)
$(INSTALLED_GHC_PKG_REAL)
--force
--global-conf
$(INSTALLED_PACKAGE_CONF)
update libffi/package.conf.install
$(INSTALLED_GHC_PKG_REAL)
--force
--global-conf
$(INSTALLED_PACKAGE_CONF)
update rts/package.conf.install
$(
foreach
p,
$(PACKAGES)
,
\
$(
foreach
p,
$(PACKAGES)
$(PACKAGES_STAGE2)
,
\
$(GHC_CABAL_INPLACE)
install
\
$(INSTALLED_GHC_PKG_REAL)
\
$(INSTALLED_PACKAGE_CONF)
\
...
...
rules/build-prog.mk
View file @
24adfcd0
...
...
@@ -100,14 +100,14 @@ $1/$2/build/tmp/$$($1_$2_PROG) : $$($1_$2_v_HS_OBJS) $$($1_$2_v_C_OBJS) $$($1_$2
$$
(
$1_$2_HC
)
-o
$$
@
$$
(
$1_$2_v_ALL_HC_OPTS
)
$
$(LD_OPTS)
$$
(
$1_$2_v_HS_OBJS
)
$$
(
$1_$2_v_C_OBJS
)
$$
(
$1_$2_v_S_OBJS
)
$$
(
$1_$2_OTHER_OBJS
)
# Note [lib-depends] if this program is built with stage1 or greater, we
# need to depend on the libraries too. NB. since $(ALL_LIBS) and
# need to depend on the libraries too. NB. since $(ALL_
STAGE1_
LIBS) and
# $(ALL_RTS_LIBS) are not defined until after libraries/*/ghc.mk have
# been included, this introduces an ordering dependency.
ifneq
"$3" "0"
ifeq
"$$(ALL_LIBS)" ""
$$(error ordering failure in $1
:
$$(ALL_LIBS) is empty)
ifeq
"$$(ALL_
STAGE1_
LIBS)" ""
$$(error ordering failure in $1
:
$$(ALL_
STAGE1_
LIBS) is empty)
endif
$1/$2/build/tmp/$($1_$2_PROG)
:
$$(ALL_LIBS) $$(ALL_RTS_LIBS) $$(OTHER_LIBS)
$1/$2/build/tmp/$($1_$2_PROG)
:
$$(ALL_
STAGE1_
LIBS) $$(ALL_RTS_LIBS) $$(OTHER_LIBS)
endif
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