From fb67e16120b05c0664503b17532d5cc28c9cd1e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Storsj=C3=B6?= <martin@martin.st>
Date: Wed, 5 Oct 2022 00:04:41 +0300
Subject: [PATCH] build-all: Stop requiring curl to be available

Curl (or wget) isn't required for fetching libssp any longer,
so don't require it while running build-all.sh.

(It's still required by build-cross-tools.sh, for build-make.sh
though.)
---
 Dockerfile         |  5 -----
 Dockerfile.dev     |  4 ----
 build-all.sh       |  3 +--
 build-libssp.sh    | 45 ---------------------------------------------
 build-mingw-w64.sh |  7 +++++++
 5 files changed, 8 insertions(+), 56 deletions(-)
 delete mode 100755 build-libssp.sh

diff --git a/Dockerfile b/Dockerfile
index 1775225..b12a45e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -62,9 +62,4 @@ RUN ./build-llvm.sh $TOOLCHAIN_PREFIX && \
     ./build-openmp.sh $TOOLCHAIN_PREFIX $CFGUARD_ARGS && \
     rm -rf /build/*
 
-# Build libssp
-COPY build-libssp.sh ./
-RUN ./build-libssp.sh $TOOLCHAIN_PREFIX && \
-    rm -rf /build/*
-
 ENV PATH=$TOOLCHAIN_PREFIX/bin:$PATH
diff --git a/Dockerfile.dev b/Dockerfile.dev
index b822b21..46bb246 100644
--- a/Dockerfile.dev
+++ b/Dockerfile.dev
@@ -153,10 +153,6 @@ RUN cd test && \
         done; \
     done
 
-# Build libssp
-COPY build-libssp.sh ./
-RUN ./build-libssp.sh $TOOLCHAIN_PREFIX
-
 RUN cd test && \
     for arch in $TOOLCHAIN_ARCHS; do \
         mkdir -p $arch && \
diff --git a/build-all.sh b/build-all.sh
index 147c7b3..b1405f6 100755
--- a/build-all.sh
+++ b/build-all.sh
@@ -72,7 +72,7 @@ if [ -z "$PREFIX" ]; then
     exit 1
 fi
 
-for dep in git curl cmake; do
+for dep in git cmake; do
     if ! command -v $dep >/dev/null; then
         echo "$dep not installed. Please install it and retry" 1>&2
         exit 1
@@ -96,5 +96,4 @@ fi
 ./build-libcxx.sh $PREFIX $CFGUARD_ARGS
 ./build-mingw-w64-libraries.sh $PREFIX $CFGUARD_ARGS
 ./build-compiler-rt.sh $PREFIX --build-sanitizers # CFGUARD_ARGS intentionally omitted
-./build-libssp.sh $PREFIX # CFGUARD_ARGS not used
 ./build-openmp.sh $PREFIX $CFGUARD_ARGS
diff --git a/build-libssp.sh b/build-libssp.sh
deleted file mode 100755
index 0616707..0000000
--- a/build-libssp.sh
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/bin/sh
-#
-# Copyright (c) 2018 Martin Storsjo
-#
-# Permission to use, copy, modify, and/or distribute this software for any
-# purpose with or without fee is hereby granted, provided that the above
-# copyright notice and this permission notice appear in all copies.
-#
-# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-set -e
-
-while [ $# -gt 0 ]; do
-    case "$1" in
-    *)
-        PREFIX="$1"
-        ;;
-    esac
-    shift
-done
-if [ -z "$PREFIX" ]; then
-    echo "$0 dest"
-    exit 1
-fi
-
-mkdir -p "$PREFIX"
-PREFIX="$(cd "$PREFIX" && pwd)"
-export PATH="$PREFIX/bin:$PATH"
-
-: ${ARCHS:=${TOOLCHAIN_ARCHS-i686 x86_64 armv7 aarch64}}
-
-for arch in $ARCHS; do
-    if [ ! -f $PREFIX/$arch-w64-mingw32/lib/libssp.a ]; then
-        # Create empty dummy archives, to avoid failing when the compiler
-        # driver adds "-lssp -lssh_nonshared" when linking.
-        llvm-ar rcs $PREFIX/$arch-w64-mingw32/lib/libssp.a
-        llvm-ar rcs $PREFIX/$arch-w64-mingw32/lib/libssp_nonshared.a
-    fi
-done
diff --git a/build-mingw-w64.sh b/build-mingw-w64.sh
index 8a7e83e..b4be47b 100755
--- a/build-mingw-w64.sh
+++ b/build-mingw-w64.sh
@@ -134,6 +134,13 @@ done
 cd ..
 
 for arch in $ARCHS; do
+    if [ ! -f $PREFIX/$arch-w64-mingw32/lib/libssp.a ]; then
+        # Create empty dummy archives, to avoid failing when the compiler
+        # driver adds "-lssp -lssh_nonshared" when linking.
+        llvm-ar rcs $PREFIX/$arch-w64-mingw32/lib/libssp.a
+        llvm-ar rcs $PREFIX/$arch-w64-mingw32/lib/libssp_nonshared.a
+    fi
+
     mkdir -p "$PREFIX/$arch-w64-mingw32/share/mingw32"
     for file in COPYING COPYING.MinGW-w64/COPYING.MinGW-w64.txt COPYING.MinGW-w64-runtime/COPYING.MinGW-w64-runtime.txt; do
         install -m644 "$file" "$PREFIX/$arch-w64-mingw32/share/mingw32"