diff --git a/extra/mold/build b/extra/mold/build index 64b2ed30..7b2d6dbf 100755 --- a/extra/mold/build +++ b/extra/mold/build @@ -1,20 +1,20 @@ #!/bin/sh -e -# -# This build system is a little funky. I want to contribute upstream to get the -# whole thing buildable with Makefiles (no Cmake). make -C xxhash # Point mold to the local xxhash. export CXXFLAGS="-L$PWD/xxhash -I$PWD/xxhash $CXXFLAGS" -# Prevent the build system from overwriting CC/CXX. -sed /clang/d Makefile > _ -mv -f _ Makefile +# CMAKE_GENERATOR must unset to force usage of Makefiles. The build system +# calls cmake and proceeds to assume that Makefiles will be used with it +# breaking builds with Ninja/Samurai. +unset CMAKE_GENERATOR -# CMAKE_GENERATOR must be set to force usage of Makefiles. The build system -# calls cmake and proceeds to assume that Makefiles will be used with it. -make CMAKE_GENERATOR= LDFLAGS="$LDFLAGS -static" +# Force a static build so shared library breakage does not also break the +# linker (and therefore the ability to recover from the issue). +export LDFLAGS="$LDFLAGS -static" + +make make install # Create a symbolic link so users can use mold as the linker system-wide diff --git a/extra/mold/checksums b/extra/mold/checksums index da99432d..26ca6670 100644 --- a/extra/mold/checksums +++ b/extra/mold/checksums @@ -1,2 +1,2 @@ -bb4dea1e6b04ef989ffd4bd32c91a4f03fcd4853c849a9d0aae2a28e56aaa99f +8fe6fdf5e9064a2755679494a83a5cb11d18a9c41cdce5c34bd6fa7a8e2e0ab7 7054c3ebd169c97b64a92d7b994ab63c70dd53a06974f1f630ab782c28db0f4f diff --git a/extra/mold/sources b/extra/mold/sources index e2f798ae..c7dc3494 100644 --- a/extra/mold/sources +++ b/extra/mold/sources @@ -1,2 +1,2 @@ -https://github.com/rui314/mold/archive/refs/tags/vVERSION.tar.gz +https://github.com/rui314/mold/archive/VERSION.tar.gz https://github.com/Cyan4973/xxHash/archive/refs/tags/v0.8.0.tar.gz xxhash diff --git a/extra/mold/version b/extra/mold/version index e582c77c..86c66335 100644 --- a/extra/mold/version +++ b/extra/mold/version @@ -1 +1 @@ -0.9.3 1 +a46ba486a81b7e3bc35d3ed381c7c52498db021a 1