moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-11-16 06:25:03 -05:00
Code Issues Releases Wiki Activity

configure: Don't set LD_LIBRARY_PATH when cross-compiling

Browse Source 
Most of LD_LIBRARY_PATH adjustments are already guarded, but not all.

The patch fixes cross-compilation failure when libidn is present.
This commit is contained in:
Aaro Koskinen 2014-05-07 21:29:47 +03:00 committed by Dan Fandrich
parent 6404896d8c
commit e48a821ed5
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
configure.ac
View File

@ -2167,10 +2167,11 @@ if test "$curl_ssl_msg" = "$init_ssl_msg"; then
USE_AXTLS="yes" USE_AXTLS="yes"
curl_ssl_msg="enabled (axTLS)" curl_ssl_msg="enabled (axTLS)"
if test "x$cross_compiling" != "xyes"; then
LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$LIB_AXTLS" LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$LIB_AXTLS"
export LD_LIBRARY_PATH export LD_LIBRARY_PATH
AC_MSG_NOTICE([Added $LIB_AXTLS to LD_LIBRARY_PATH]) AC_MSG_NOTICE([Added $LIB_AXTLS to LD_LIBRARY_PATH])
fi
],[ ],[
LDFLAGS="$CLEANLDFLAGS" LDFLAGS="$CLEANLDFLAGS"
CPPFLAGS="$CLEANCPPFLAGS" CPPFLAGS="$CLEANCPPFLAGS"
@ -2702,7 +2703,7 @@ if test "$want_idn" = "yes"; then
if test "x$ac_cv_header_tld_h" = "xyes"; then if test "x$ac_cv_header_tld_h" = "xyes"; then
AC_SUBST([IDN_ENABLED], [1]) AC_SUBST([IDN_ENABLED], [1])
curl_idn_msg="enabled" curl_idn_msg="enabled"
if test -n "$IDN_DIR"; then if test -n "$IDN_DIR" -a "x$cross_compiling" != "xyes"; then
LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$IDN_DIR" LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$IDN_DIR"
export LD_LIBRARY_PATH export LD_LIBRARY_PATH
AC_MSG_NOTICE([Added $IDN_DIR to LD_LIBRARY_PATH]) AC_MSG_NOTICE([Added $IDN_DIR to LD_LIBRARY_PATH])