Release CI #75
Open
Release CI #75
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
hasufell
force-pushed
the
release-ci
branch
19 times, most recently
from
1370fdb to
c61c1ef
Compare
hasufell
force-pushed
the
release-ci
branch
4 times, most recently
from
c304c1c to
4d0a366
Compare
angerman
reviewed
Sep 15, 2025
| AS_IF( | ||
| [test "$CABAL_FLAG_libm" = 1], | ||
| [AC_DEFINE([HAVE_LIBM], [1], [Define to 1 if you need to link with libm])]) | ||
| AC_SEARCH_LIBS([exp2], [m]) |
There was a problem hiding this comment.
We'll want to extract this (libm) into a separate PR, which we can also upstream.
There was a problem hiding this comment.
Comment on lines
+183
to
+186
| # force skip uniques if not in a git checkout | ||
| forceSkipUniquesTest = not inside_git_repo() | ||
| config.skip_uniques_test = args.skip_uniques_test or forceSkipUniquesTest | ||
|
|
There was a problem hiding this comment.
We should extract this as a separate upstreamable PR as well.
There was a problem hiding this comment.
I don't see a point in creating a PR for this in stable-haskell. I however opened a PR upstream: https://gitlab.haskell.org/ghc/ghc/-/merge_requests/14940
|
|
||
| $(TOP)/ghc-config/ghc-config : $(TOP)/ghc-config/ghc-config.hs | ||
| "$(TEST_HC)" --make -o $@ $< | ||
| "$(TEST_HC)" $(EXTRA_HC_OPTS) --make -o $@ $< |
There was a problem hiding this comment.
This seems fundamentally correct. I'm still a bit surprised this wasn't already part of the test-suite?
@hsyl20 any thoughts on this?
|
|
||
| $(TOP)/ghc-config/ghc-config : $(TOP)/ghc-config/ghc-config.hs | ||
| "$(TEST_HC)" --make -o $@ $< | ||
| "$(TEST_HC)" $(EXTRA_HC_OPTS) --make -o $@ $< |
There was a problem hiding this comment.
We'd want to extract this EXTRA_HC_OPTS part into a separate PR as well for upstreaming.
There was a problem hiding this comment.
| findMergeObjs :: ProgOpt -> Cc -> CcLink -> Nm -> M MergeObjs | ||
| findMergeObjs progOpt cc ccLink nm = checking "for linker for merging objects" $ do | ||
| prog <- findProgram "linker for merging objects" progOpt ["ld.gold", "ld"] | ||
| prog <- findProgram "linker for merging objects" progOpt ["ld"] |
There was a problem hiding this comment.
This should ultimately also end up being a seperate PR for upstreaming.
There was a problem hiding this comment.
Comment on lines
131
to
143
| if os(freebsd) | ||
| package rts | ||
| ghc-options: "-optc-DProjectVersion=\"914\"" | ||
| ghc-options: "-optc-DRtsWay=\"v\"" | ||
| ghc-options: "-optc-DHostPlatform=\"x86_64-portbld-freebsd\"" | ||
| ghc-options: "-optc-DHostArch=\"x86_64\"" | ||
| ghc-options: "-optc-DHostOS=\"freebsd\"" | ||
| ghc-options: "-optc-DHostVendor=\"unknown\"" | ||
| ghc-options: "-optc-DBuildPlatform=\"FIXME\"" | ||
| ghc-options: "-optc-DBuildArch=\"FIXME\"" | ||
| ghc-options: "-optc-DBuildOS=\"FIXME\"" | ||
| ghc-options: "-optc-DBuildVendor=\"FIXME\"" | ||
| ghc-options: "-optc-DGhcUnregisterised=\"FIXME\"" | ||
| ghc-options: "-optc-DTablesNextToCode=\"FIXME\"" | ||
| ghc-options: "-optc-DFS_NAMESPACE=rts" | ||
| flags: +tables-next-to-code |
There was a problem hiding this comment.
These should be extracted into a separate PR: "FreeBSD support".
Comment on lines
102
to
104
| CABAL ?= cabal | ||
| SED ?= sed | ||
|
|
There was a problem hiding this comment.
These seem sensible. We should probably extract this change? Seems already like a PR we could merge?
hasufell
force-pushed
the
release-ci
branch
3 times, most recently
from
856afdd to
fa9e43f
Compare
hasufell
force-pushed
the
release-ci
branch
from
2393efd to
4ba4451
Compare
hasufell
force-pushed
the
release-ci
branch
2 times, most recently
from
f71df05 to
cb729ad
Compare
hasufell
force-pushed
the
release-ci
branch
2 times, most recently
from
49cbba3 to
4f3a7ba
Compare
hasufell
force-pushed
the
release-ci
branch
2 times, most recently
from
33a48ef to
79c7344
Compare
Fixes #26434 In detail, this does a number of things: * Makes GHC aware of 'extra-libraries-static' (this changes the package database format). * Adds a switch '-static-external' that will honour 'extra-libraries-static' to link external system dependencies statically. * Adds a new field to settings/targets: "ld supports verbatim namespace". This field is used by '-static-external' to conditionally use '-l:foo.a' syntax during linking, which is more robust than trying to find the absolute path to an archive on our own. * Adds a switch '-fully-static' that is meant as a high-level interface for e.g. cabal. This also honours 'extra-libraries-static'. This also attempts to clean up the confusion around library search directories. At the moment, we have 3 types of directories in the package database format: * library-dirs * library-dirs-static * dynamic-library-dirs However, we only have two types of linking: dynamic or static. Given the existing logic in 'mungeDynLibFields', this patch assumes that 'library-dirs' is really just nothing but a fallback and always prefers the more specific variants if they exist and are non-empty. Conceptually, we should be ok with even just one search dirs variant. Haskell libraries are named differently depending on whether they're static or dynamic, so GHC can conveniently pick the right one depending on the linking needs. That means we don't really need to play tricks with search paths to convince the compiler to do linking as we want it. For system C libraries, the convention has been anyway to place static and dynamic libs next to each other, so we need to deal with that issue anyway and it is outside of our control. But this is out of the scope of this patch. This patch is backwards compatible with cabal. Cabal should however be patched to use the new '-fully-static' switch.
"Executable" seems more appropriate.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.