Skip to content

Commit 5bfea9d

Browse files
authored
tools: fix v doctor output on OpenBSD: get gcc version from egcc; do not run ldd to get the glibc version (fix #23576) (#23578)
1 parent 67a8c81 commit 5bfea9d

File tree

1 file changed

+10
-2
lines changed

1 file changed

+10
-2
lines changed

cmd/tools/vdoctor.v

+10-2
Original file line numberDiff line numberDiff line change
@@ -136,15 +136,23 @@ fn (mut a App) collect_info() {
136136
a.line('.git/config present', os.is_file('.git/config').str())
137137
a.line('', '')
138138
a.line('cc version', a.cmd(command: 'cc --version'))
139-
a.line('gcc version', a.cmd(command: 'gcc --version'))
139+
if os_kind == 'openbsd' {
140+
a.line('gcc version', a.cmd(command: 'egcc --version'))
141+
} else {
142+
a.line('gcc version', a.cmd(command: 'gcc --version'))
143+
}
140144
a.line('clang version', a.cmd(command: 'clang --version'))
141145
if os_kind == 'windows' {
142146
// Check for MSVC on windows
143147
a.line('msvc version', a.cmd(command: 'cl'))
144148
}
145149
a.report_tcc_version('thirdparty/tcc')
146150
a.line('emcc version', a.cmd(command: 'emcc --version'))
147-
a.line('glibc version', a.cmd(command: 'ldd --version'))
151+
if os_kind != 'openbsd' {
152+
a.line('glibc version', a.cmd(command: 'ldd --version'))
153+
} else {
154+
a.line('glibc version', 'N/A')
155+
}
148156
}
149157

150158
struct CmdConfig {

0 commit comments

Comments
 (0)