Skip to content

Commit

Permalink
curl-functions.m4: revert DYLD_LIBRARY_PATH tricks in CURL_RUN_IFELSE
Browse files Browse the repository at this point in the history
Mostly reverts ba0657c, but now instead just does nothing on darwin.

Fixes #8229
Reported-by: Ryan Schmidt
  • Loading branch information
bagder committed Jan 8, 2022
1 parent 4936e60 commit 8a02411
Showing 1 changed file with 1 addition and 6 deletions.
7 changes: 1 addition & 6 deletions m4/curl-functions.m4
Expand Up @@ -5,7 +5,7 @@
# | (__| |_| | _ <| |___
# \___|\___/|_| \_\_____|
#
# Copyright (C) 1998 - 2021, Daniel Stenberg, <daniel@haxx.se>, et al.
# Copyright (C) 1998 - 2022, Daniel Stenberg, <daniel@haxx.se>, et al.
#
# This software is licensed as described in the file COPYING, which
# you should have received as part of this distribution. The terms
Expand Down Expand Up @@ -6516,11 +6516,6 @@ dnl changes contained within this macro.
AC_DEFUN([CURL_RUN_IFELSE], [
case $host_os in
darwin*)
old=$DYLD_LIBRARY_PATH
DYLD_LIBRARY_PATH=$CURL_LIBRARY_PATH:$old
export DYLD_LIBRARY_PATH
AC_RUN_IFELSE([AC_LANG_SOURCE([$1])], $2, $3, $4)
DYLD_LIBRARY_PATH=$old # restore
;;
*)
old=$LD_LIBRARY_PATH
Expand Down

0 comments on commit 8a02411

Please sign in to comment.