Steve Lhomme pushed to branch master at VideoLAN / VLC
Commits:
c1c4701b by Steve Lhomme at 2026-01-23T08:56:17+00:00
contrib: bootstrap: fix ln -s usage in WSL/msys
The current call results in a rust-toolchain.toml with a size of 0.
This is similar to what was done in the contribs with
2ee53944ab269d4c5e6714019c007434fafee778
- - - - -
1 changed file:
- contrib/bootstrap
Changes:
=====================================
contrib/bootstrap
=====================================
@@ -260,6 +260,8 @@ test -z "$AD_CLAUSES" || add_make_enabled "AD_CLAUSES"
test -z "$WITH_OPTIMIZATION" || add_make_enabled "WITH_OPTIMIZATION"
test -z "$ENABLE_PDB" || add_make_enabled "ENABLE_PDB"
+LN_S="ln -s"
+
#
# Checks
#
@@ -350,6 +352,7 @@ case "${OS}" in
add_make_enabled "HAVE_ARMV7A"
;;
esac
+ LN_S="cp -R"
;;
*solaris*)
add_make_enabled "HAVE_SOLARIS"
@@ -379,6 +382,6 @@ add_make "-include config.mak"
add_make 'include $(TOPSRC)/src/main.mak'
mkdir -p "$BOOTSTRAP_PATH/tarballs" || exit $?
test -e rust-toolchain.toml && unlink rust-toolchain.toml
-ln -s "$(dirname "$0")/src/rust-toolchain.toml" rust-toolchain.toml
+${LN_S} "$(dirname "$0")/src/rust-toolchain.toml" rust-toolchain.toml
echo "Bootstrap completed."
${MAKE} help
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/commit/c1c4701b7600cdb02d0bf2be223979c4859b7d6f
--
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/commit/c1c4701b7600cdb02d0bf2be223979c4859b7d6f
You're receiving this email because of your account on code.videolan.org.
VideoLAN code repository instance_______________________________________________
vlc-commits mailing list
[email protected]
https://mailman.videolan.org/listinfo/vlc-commits
