RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-01-21 06:50:56 +00:00
Code Issues Projects Releases Wiki Activity

Merge commit '333a34da3a6d13155de480e7d16ec5fec7f4cd6c'

Browse Source 
* commit '333a34da3a6d13155de480e7d16ec5fec7f4cd6c':
  configure: Automatically add -isysroot for darwin if --sysroot is specified

Merged-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer 2017-11-06 17:50:00 -03:00
commit 7a5a1c8c97
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
configure vendored
View File

@ -4455,9 +4455,6 @@ if test -n "$sysroot"; then
gcc|llvm_gcc|clang) gcc|llvm_gcc|clang)
add_cppflags --sysroot="$sysroot" add_cppflags --sysroot="$sysroot"
add_ldflags --sysroot="$sysroot" add_ldflags --sysroot="$sysroot"
# On Darwin --sysroot may be ignored, -isysroot always affects headers and linking
add_cppflags -isysroot "$sysroot"
add_ldflags -isysroot "$sysroot"
;; ;;
tms470) tms470)
add_cppflags -I"$sysinclude" add_cppflags -I"$sysinclude"
@ -5012,6 +5009,10 @@ case $target_os in
{ check_cflags -mdynamic-no-pic && add_asflags -mdynamic-no-pic; } { check_cflags -mdynamic-no-pic && add_asflags -mdynamic-no-pic; }
check_header dispatch/dispatch.h && check_header dispatch/dispatch.h &&
add_cppflags '-I\$(SRC_PATH)/compat/dispatch_semaphore' add_cppflags '-I\$(SRC_PATH)/compat/dispatch_semaphore'
if test -n "$sysroot"; then
is_in -isysroot $cc $CPPFLAGS $CFLAGS || check_cppflags -isysroot $sysroot
is_in -isysroot $ld $LDFLAGS || check_ldflags -isysroot $sysroot
fi
version_script='-exported_symbols_list' version_script='-exported_symbols_list'
VERSION_SCRIPT_POSTPROCESS_CMD='tr " " "\n" | sed -n /global:/,/local:/p | grep ";" | tr ";" "\n" | sed -E "s/(.+)/_\1/g" | sed -E "s/(.+[^*])$$$$/\1*/"' VERSION_SCRIPT_POSTPROCESS_CMD='tr " " "\n" | sed -n /global:/,/local:/p | grep ";" | tr ";" "\n" | sed -E "s/(.+)/_\1/g" | sed -E "s/(.+[^*])$$$$/\1*/"'
;; ;;