X Tutup
Skip to content

BUILD: Support both $_host-peldd and peldd for mingw builds#6574

Merged
lephilousophe merged 1 commit intoscummvm:masterfrom
dwatteau:fix/build-win9x-try-other-name-for-peldd-ldd
Apr 30, 2025
Merged

BUILD: Support both $_host-peldd and peldd for mingw builds#6574
lephilousophe merged 1 commit intoscummvm:masterfrom
dwatteau:fix/build-win9x-try-other-name-for-peldd-ldd

Conversation

@dwatteau
Copy link
Contributor

When using the windows-9x toolchain, the make win32dist-mingw DESTDIR=win32dist-mingw stage would end with this output:

...
ldd win32dist-mingw/scummvm.exe | grep -i mingw | cut -d">" -f2 | cut -d" " -f2 | sort -u | xargs -I files cp -vu files win32dist-mingw
	not a dynamic executable

i.e. the peldd code from previous PR #3196 wasn't called.

Indeed, there is not such prefixed binary in the win9x toolchain:

$ ./devtools/docker.sh toolchains/windows-9x
# which mingw32-peldd || echo "not found"
not found
# which peldd || echo "not found"
/opt/toolchains/mingw32/bin/peldd

Maybe something needs to be tweaked in the toolchain to have a prefixed version, but in the meantime I think also looking for a plain peldd in our build scripts is quite reasonable.

@lephilousophe: Any objection to this?

toolchains/windows-9x currently only has a `peldd` binary, with no host
prefix.
@lephilousophe
Copy link
Member

Hum... I just looked at it and I don't know. 😄
On MXE, there are two versions, the unprefixed one which is the raw binary and the prefixed one which is a wrapper script with some preconfigured paths and ignored DLLs.

I wonder if we should do the same on our Windows 9x toolchain or not.

What's the result with your patch? Does it try to fetch opengl32 for example?

@dwatteau
Copy link
Contributor Author

What's the result with your patch? Does it try to fetch opengl32 for example?

You mean, what's the output being then fed to xargs in the win9x build, with this patch?

It's empty. So the PR just fixes the make target ending with an error status

@lephilousophe
Copy link
Member

OK! Then let's go!

@lephilousophe lephilousophe merged commit 5ab2365 into scummvm:master Apr 30, 2025
8 checks passed
@dwatteau dwatteau deleted the fix/build-win9x-try-other-name-for-peldd-ldd branch May 1, 2025 01:18
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.

3 participants

X Tutup