Skip to content

Fix CI failures from updated runner images (deriveConstants, ld warnings) #180

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
angerman merged 3 commits into from
Apr 5, 2026
Merged

Fix CI failures from updated runner images (deriveConstants, ld warnings) #180

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b0a6be2
testsuite: normalise macOS ld reexported library warning
angerman Apr 4, 2026
8163682
deriveConstants: split CC flags from program path
angerman Apr 4, 2026
8f81550
ghc-internal: use struct _utimbuf on Windows
angerman Apr 4, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions libraries/ghc-internal/src/GHC/Internal/System/Posix/Internals.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,11 @@ data {-# CTYPE "struct stat" #-} CStat
data {-# CTYPE "struct termios" #-} CTermios
data {-# CTYPE "struct tm" #-} CTm
data {-# CTYPE "struct tms" #-} CTms
#if defined(mingw32_HOST_OS)
data {-# CTYPE "struct _utimbuf" #-} CUtimbuf
#else
data {-# CTYPE "struct utimbuf" #-} CUtimbuf
#endif
data {-# CTYPE "struct utsname" #-} CUtsname

type FD = CInt
Expand Down
4 changes: 4 additions & 0 deletions testsuite/driver/testlib.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3061,6 +3061,8 @@ def normalise_errmsg(s: str) -> str:
s = re.sub('ld: warning: -sdk_version and -platform_version are not compatible, ignoring -sdk_version','',s)
# ignore superfluous dylibs passed to the linker.
s = re.sub('ld: warning: .*, ignoring unexpected dylib file\n','',s)
# ignore macOS ld warning about reexported libraries (e.g. Homebrew llvm libunwind)
s = re.sub('ld: warning: reexported library with install name .* couldn.t be matched with any parent library and will be linked directly\n','',s)
# ignore LLVM Version mismatch garbage; this will just break tests.
s = re.sub('You are using an unsupported version of LLVM!.*\n','',s)
s = re.sub('Currently only [\\.0-9]+ is supported. System LLVM version: [\\.0-9]+.*\n','',s)
Expand Down Expand Up @@ -3175,6 +3177,8 @@ def normalise_output( s: str ) -> str:
s = re.sub('ld: warning: -sdk_version and -platform_version are not compatible, ignoring -sdk_version','',s)
# ignore superfluous dylibs passed to the linker.
s = re.sub('ld: warning: .*, ignoring unexpected dylib file\n','',s)
# ignore macOS ld warning about reexported libraries (e.g. Homebrew llvm libunwind)
s = re.sub('ld: warning: reexported library with install name .* couldn.t be matched with any parent library and will be linked directly\n','',s)
# ignore LLVM Version mismatch garbage; this will just break tests.
s = re.sub('You are using an unsupported version of LLVM!.*\n','',s)
s = re.sub('Currently only [\\.0-9]+ is supported. System LLVM version: [\\.0-9]+.*\n','',s)
Expand Down
5 changes: 4 additions & 1 deletion utils/deriveConstants/Main.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,10 @@ parseArgs = do args <- getArgs
f opts ("-o" : fn : args')
= f (opts {o_outputFilename = Just fn}) args'
f opts ("--gcc-program" : prog : args')
= f (opts {o_gccProg = Just prog}) args'
= case words prog of
(p:flags) -> f (opts {o_gccProg = Just p,
o_gccFlags = flags ++ o_gccFlags opts}) args'
[] -> f (opts {o_gccProg = Just prog}) args'
f opts ("--gcc-flag" : flag : args')
= f (opts {o_gccFlags = flag : o_gccFlags opts}) args'
f opts ("--nm-program" : prog : args')
Expand Down
Loading