Просмотр исходного кода

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
boxjan 3 лет назад
Родитель
Сommit
4a432d99fc

+ 1 - 1
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 "${@}"

+ 1 - 1
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)"