diff options
| author | boxjan <i@boxjan.li> | 2021-12-07 22:59:22 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-07 09:59:22 -0500 |
| commit | 4a432d99fc7167de6deec8c56aef2c116cd008f8 (patch) | |
| tree | da3161bfa5ae45b6963117a757f20c06aad01aac /packaging | |
| parent | 1fd40e59d84ad6cad8d33cb0cbe7f8b890f2e465 (diff) | |
fix static build, curl will be staict binary; extra args can be transfer (#11852)
* update curl LDFLAGS to build static file
* transfer extra args to build.sh
Diffstat (limited to 'packaging')
| -rwxr-xr-x | packaging/makeself/build-x86_64-static.sh | 2 | ||||
| -rwxr-xr-x | packaging/makeself/jobs/50-curl-7.78.0.install.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/packaging/makeself/build-x86_64-static.sh b/packaging/makeself/build-x86_64-static.sh index 0f5f1df145..59d2078f46 100755 --- a/packaging/makeself/build-x86_64-static.sh +++ b/packaging/makeself/build-x86_64-static.sh @@ -4,4 +4,4 @@ SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )" -"${SCRIPT_DIR}/build-static.sh" x86_64 +"${SCRIPT_DIR}/build-static.sh" x86_64 "${@}" diff --git a/packaging/makeself/jobs/50-curl-7.78.0.install.sh b/packaging/makeself/jobs/50-curl-7.78.0.install.sh index a2bb24e2c7..aeab1af685 100755 --- a/packaging/makeself/jobs/50-curl-7.78.0.install.sh +++ b/packaging/makeself/jobs/50-curl-7.78.0.install.sh @@ -40,7 +40,7 @@ run ./configure \ --with-openssl # Curl autoconf does not honour the curl_LDFLAGS environment variable -run sed -i -e "s/curl_LDFLAGS =/curl_LDFLAGS = -all-static/" src/Makefile +run sed -i -e "s/LDFLAGS =/LDFLAGS = -all-static/" src/Makefile run make clean run make -j "$(nproc)" |