Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
GHC
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Terraform modules
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Reinier Maas
GHC
Commits
29fbbd4e
Commit
29fbbd4e
authored
1 year ago
by
Matthew Pickering
Committed by
Marge Bot
1 year ago
Browse files
Options
Downloads
Patches
Plain Diff
Remove references to make build system in mk/build.mk
Fixes #23636
parent
09a5c6cc
Loading
Loading
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
.gitlab/ci.sh
+0
-30
0 additions, 30 deletions
.gitlab/ci.sh
with
0 additions
and
30 deletions
.gitlab/ci.sh
+
0
−
30
View file @
29fbbd4e
...
...
@@ -75,16 +75,6 @@ Environment variables affecting both build systems:
(either "x86-64-darwin" or "aarch-darwin")
NO_BOOT Whether to run ./boot or not, used when testing the source dist
Environment variables determining build configuration of Make system:
BUILD_FLAVOUR Which flavour to build.
BUILD_SPHINX_HTML Whether to build Sphinx HTML documentation.
BUILD_SPHINX_PDF Whether to build Sphinx PDF documentation.
INTEGER_LIBRARY Which integer library to use (integer-simple or integer-gmp).
HADDOCK_HYPERLINKED_SOURCES
Whether to build hyperlinked Haddock sources.
TEST_TYPE Which test rule to run.
Environment variables determining build configuration of Hadrian system:
BUILD_FLAVOUR Which flavour to build.
...
...
@@ -390,26 +380,6 @@ function cleanup_submodules() {
end_section
"clean submodules"
}
function
prepare_build_mk
()
{
if
[[
-z
"
$BUILD_FLAVOUR
"
]]
;
then
fail
"BUILD_FLAVOUR is not set"
;
fi
if
[[
-z
${
BUILD_SPHINX_HTML
:-}
]]
;
then
BUILD_SPHINX_HTML
=
YES
;
fi
if
[[
-z
${
BUILD_SPHINX_PDF
:-}
]]
;
then
BUILD_SPHINX_PDF
=
YES
;
fi
cat
>
mk/build.mk
<<
EOF
BIGNUM_BACKEND=
${
BIGNUM_BACKEND
}
include mk/flavours/
${
BUILD_FLAVOUR
}
.mk
GhcLibHcOpts+=-haddock
EOF
if
[
-n
"
${
HADDOCK_HYPERLINKED_SOURCES
:-}
"
]
;
then
echo
"EXTRA_HADDOCK_OPTS += --hyperlinked-source --quickjump"
>>
mk/build.mk
fi
info
"build.mk is:"
cat
mk/build.mk
}
function
configure
()
{
case
"
${
CONFIGURE_WRAPPER
:-}
"
in
emconfigure
)
source
"
$EMSDK
/emsdk_env.sh"
;;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment