diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh index 7c6a20e27..6219f873e 100644 --- a/scripts/bootstrap.sh +++ b/scripts/bootstrap.sh @@ -142,7 +142,7 @@ vcpkgDownloadFile() { url=$1; downloadPath=$2 sha512=$3 rm -rf "$downloadPath.part" - curl -L $url --tlsv1.2 --create-dirs --retry 3 --output "$downloadPath.part" --silent --show-error --fail || exit 1 + curl -L $url --create-dirs --retry 3 --output "$downloadPath.part" --silent --show-error --fail || exit 1 vcpkgCheckEqualFileHash $url "$downloadPath.part" $sha512 chmod +x "$downloadPath.part" @@ -169,24 +169,8 @@ vcpkgExtractTar() # Read the vcpkg-tool config file to determine what release to download . "$vcpkgRootDir/scripts/vcpkg-tool-metadata.txt" -vcpkgDownloadTool="ON" -if [ "$UNAME" = "Darwin" ]; then - echo "Downloading vcpkg-macos..." - vcpkgToolReleaseSha=$VCPKG_MACOS_SHA - vcpkgToolName="vcpkg-macos" -elif [ "$vcpkgUseMuslC" = "ON" ]; then - echo "Downloading vcpkg-muslc..." - vcpkgToolReleaseSha=$VCPKG_MUSLC_SHA - vcpkgToolName="vcpkg-muslc" -elif [ "$ARCH" = "x86_64" ]; then - echo "Downloading vcpkg-glibc..." - vcpkgToolReleaseSha=$VCPKG_GLIBC_SHA - vcpkgToolName="vcpkg-glibc" -else - echo "Unable to determine a binary release of vcpkg; attempting to build from source." - vcpkgDownloadTool="OFF" - vcpkgToolReleaseSha=$VCPKG_TOOL_SOURCE_SHA -fi +vcpkgDownloadTool="OFF" +vcpkgToolReleaseSha=$VCPKG_TOOL_SOURCE_SHA # Do the download or build. if [ "$vcpkgDownloadTool" = "ON" ]; then @@ -211,7 +195,7 @@ else rm -rf "$baseBuildDir" mkdir -p "$buildDir" vcpkgExtractTar "$tarballPath" "$srcBaseDir" - cmakeConfigOptions="-DCMAKE_BUILD_TYPE=Release -G 'Ninja' -DVCPKG_DEVELOPMENT_WARNINGS=OFF" + cmakeConfigOptions="-DCMAKE_BUILD_TYPE=Release -G 'Ninja' -DVCPKG_DEVELOPMENT_WARNINGS=OFF -DCMAKE_EXE_LINKER_FLAGS='-static-libgcc -static-libstdc++'" if [ "${VCPKG_MAX_CONCURRENCY}" != "" ] ; then cmakeConfigOptions=" $cmakeConfigOptions '-DCMAKE_JOB_POOL_COMPILE:STRING=compile' '-DCMAKE_JOB_POOL_LINK:STRING=link' '-DCMAKE_JOB_POOLS:STRING=compile=$VCPKG_MAX_CONCURRENCY;link=$VCPKG_MAX_CONCURRENCY' "