luo980/curl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

configure: fix build with arbitrary CC and LD_LIBRARY_PATH

Browse Source 
Since ./configure and processes that inherit its environment variables
are the only callers of the run-compiler script, we can just save the
current value of the LD_LIBRARY_PATH and CC variables to another pair of
environment variables, and make run-compiler a static script that
simply restores CC and LD_LIBRARY_PATH to the saved value, and before
running the compiler.

This avoids having to inject the values of the variables in the script,
possibly causing problems if they contains spaces, quotes, and other
special characters.

Also add exports in the script just in case LD_LIBRARY_PATH and CC are
not already in the environment.

follow-up from 471dab2

Closes #11182
This commit is contained in:
Emanuele Torre 2023-05-23 11:59:59 +02:00 committed by Daniel Stenberg
parent 6375a65433
commit c4a019603b
No known key found for this signature in database
GPG Key ID: 5CC908FDB71E12C2
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
configure.ac
View File

@ -193,9 +193,13 @@ dnl something different but only have that affect the execution of the results
dnl of the compile, not change the libraries for the compiler itself.
dnl
compilersh="run-compiler"
echo "CC=\"$CC\"" > $compilersh
echo "LD_LIBRARY_PATH=\"$LD_LIBRARY_PATH\"" >> $compilersh
echo 'exec $CC $@' >> $compilersh
export "CURL_SAVED_CC=$CC"
export "CURL_SAVED_LD_LIBRARY_PATH=$LD_LIBRARY_PATH"
cat <<\EOF > "$compilersh"
export "CC=$CURL_SAVED_CC"
export "LD_LIBRARY_PATH=$CURL_SAVED_LD_LIBRARY_PATH"
exec $CC "$@"
EOF
dnl **********************************************************************
dnl See which TLS backend(s) that are requested. Just do all the