Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
G
GHC musl
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Glasgow Haskell Compiler
GHC musl
Commits
1a2460a2
Verified
Commit
1a2460a2
authored
3 months ago
by
Olivier Benz
Browse files
Options
Downloads
Patches
Plain Diff
Update tweaks to build linux/riscv64 images
parent
0ed277ac
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
VERSION_MATRIX.md
+3
-0
3 additions, 0 deletions
VERSION_MATRIX.md
latest.Dockerfile
+4
-1
4 additions, 1 deletion
latest.Dockerfile
prior/9.10.1.Dockerfile
+3
-3
3 additions, 3 deletions
prior/9.10.1.Dockerfile
with
10 additions
and
4 deletions
VERSION_MATRIX.md
+
3
−
0
View file @
1a2460a2
...
@@ -52,6 +52,9 @@ Topmost entry = Tag `latest`
...
@@ -52,6 +52,9 @@ Topmost entry = Tag `latest`
*
Images based on Alpine 3.{17,18}: Package pkgconf downgraded to v1.8.1
*
Images based on Alpine 3.{17,18}: Package pkgconf downgraded to v1.8.1
*
Due to
<https://github.com/haskell/cabal/issues/8923>
*
Due to
<https://github.com/haskell/cabal/issues/8923>
*
`linux/riscv64`
image for GHC version 9.12.1 built with
`--flavour="quick+llvm`
*
Due to
<https://gitlab.haskell.org/ghc/ghc/-/issues/25594>
## Experimental
## Experimental
...
...
This diff is collapsed.
Click to expand it.
latest.Dockerfile
+
4
−
1
View file @
1a2460a2
...
@@ -48,6 +48,9 @@ RUN cd /tmp \
...
@@ -48,6 +48,9 @@ RUN cd /tmp \
&&
tar
-xJf
"ghc-
$GHC_VERSION
-src.tar.xz"
\
&&
tar
-xJf
"ghc-
$GHC_VERSION
-src.tar.xz"
\
&&
cd
"ghc-
$GHC_VERSION
"
\
&&
cd
"ghc-
$GHC_VERSION
"
\
## Configure and build
## Configure and build
&& if [ "$(uname -m)" = "riscv64" ]; then \
flavour="quick+llvm"; \
fi \
&& ./boot.source \
&& ./boot.source \
&& ./configure \
&& ./configure \
--build=$(uname -m)-alpine-linux \
--build=$(uname -m)-alpine-linux \
...
@@ -64,7 +67,7 @@ RUN cd /tmp \
...
@@ -64,7 +67,7 @@ RUN cd /tmp \
&& export PATH=/root/.local/bin:$PATH \
&& export PATH=/root/.local/bin:$PATH \
## See https://unix.stackexchange.com/questions/519092/what-is-the-logic-of-using-nproc-1-in-make-command
## See https://unix.stackexchange.com/questions/519092/what-is-the-logic-of-using-nproc-1-in-make-command
&& hadrian/build binary-dist -j"$(($(nproc)+1))" \
&& hadrian/build binary-dist -j"$(($(nproc)+1))" \
--flavour=perf+llvm+split_sections \
--flavour=
${flavour:-
perf+llvm+split_sections
}
\
--docs=none
--docs=none
FROM
bootstrap
AS
bootstrap-cabal
FROM
bootstrap
AS
bootstrap-cabal
...
...
This diff is collapsed.
Click to expand it.
prior/9.10.1.Dockerfile
+
3
−
3
View file @
1a2460a2
...
@@ -59,9 +59,9 @@ RUN cd /tmp \
...
@@ -59,9 +59,9 @@ RUN cd /tmp \
&& mv "/tmp/$GHC_VERSION.patch" . \
&& mv "/tmp/$GHC_VERSION.patch" . \
&& patch -p0 <"$GHC_VERSION.patch" \
&& patch -p0 <"$GHC_VERSION.patch" \
## Configure and build
## Configure and build
&&
case
"$(uname -m)"
i
n \
&&
if [
"$(uname -m)"
= "riscv64" ]; the
n \
riscv64)
numa="no"
;
; \
numa="no"; \
esac
\
fi
\
&& ./boot.source \
&& ./boot.source \
&& ./configure \
&& ./configure \
--build=$(uname -m)-alpine-linux \
--build=$(uname -m)-alpine-linux \
...
...
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