Skip to content

Strip whitespace from $arch and use cl.exe instead of "cl".#1

Merged
mstorsjo merged 1 commit intoFFmpeg:masterfrom
rdoeffinger:master
Apr 24, 2024
Merged

Strip whitespace from $arch and use cl.exe instead of "cl".#1
mstorsjo merged 1 commit intoFFmpeg:masterfrom
rdoeffinger:master

Conversation

@rdoeffinger
Copy link
Copy Markdown

The output of the "arch" command ends with a newline, thus not
matching any of the architectures.
When running under wsl it is necessary to specify the extension,
so prefer the full cl.exe name instead of just "cl".

@mstorsjo
Copy link
Copy Markdown
Member

Hi! I didn't see this PR before, as we don't usually use PRs for contributions here (we normally just send patches for review at ffmpeg-devel, even if this is a separate repo). I just merged a similar change from #1, but the other change, about stripping whitespace from arch, probably is fine.

I can merge this, updating the commit message to reflect that the cl.exe change no longer ended up contained in this commit.

The output of the "arch" command ends with a newline, thus not
matching any of the architectures.
@mstorsjo mstorsjo merged commit e29a3c6 into FFmpeg:master Apr 24, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants