diff --git a/Meta/ladybird.sh b/Meta/ladybird.sh index 04a2369ed71..a2cf28a6827 100755 --- a/Meta/ladybird.sh +++ b/Meta/ladybird.sh @@ -127,7 +127,6 @@ build_cmake() { } build_vcpkg() { - echo "Building vcpkg" ( cd "$LADYBIRD_SOURCE_DIR/Toolchain" && ./BuildVcpkg.sh ) } @@ -136,10 +135,7 @@ ensure_toolchain() { build_cmake fi - # FIXME: Add a version check if needed. - if [ ! -x "${LADYBIRD_SOURCE_DIR}/Toolchain/Local/vcpkg/bin/vcpkg" ]; then - build_vcpkg - fi + build_vcpkg } run_gdb() { diff --git a/Toolchain/BuildVcpkg.sh b/Toolchain/BuildVcpkg.sh index dd899dbd500..4f64b35f4db 100755 --- a/Toolchain/BuildVcpkg.sh +++ b/Toolchain/BuildVcpkg.sh @@ -26,7 +26,17 @@ PREFIX_DIR="$DIR/Local/vcpkg" mkdir -p "$DIR/Tarballs" pushd "$DIR/Tarballs" - [ ! -d vcpkg ] && git clone $GIT_REPO + if [[ ! -d vcpkg ]]; then + git clone "${GIT_REPO}" + else + bootstrapped_vcpkg_version=$(git -C vcpkg rev-parse HEAD) + + if [[ "${bootstrapped_vcpkg_version}" == "${GIT_REV}" ]]; then + exit 0 + fi + fi + + echo "Building vcpkg" cd vcpkg git fetch origin