Skip to content

Commit

Permalink
coin: Remove ffmpeg workaround for broken Xcode 15 linker
Browse files Browse the repository at this point in the history
Recent versions of Xcode (15.3 at least) no longer have this issue.

Change-Id: Iafba08094c3a52c9fd005f0d236fcb945ac43ed4
Reviewed-by: Ville-Pekka Karhu <[email protected]>
  • Loading branch information
torarnv committed Sep 12, 2024
1 parent 6ed7812 commit 3b9fea6
Showing 1 changed file with 0 additions and 6 deletions.
6 changes: 0 additions & 6 deletions coin/provisioning/common/unix/install-ffmpeg.sh
Original file line number Diff line number Diff line change
Expand Up @@ -100,12 +100,6 @@ elif [ "$os" == "macos" ] || [ "$os" == "macos-universal" ]; then
export MACOSX_DEPLOYMENT_TARGET=12
fix_relative_dependencies="${BASH_SOURCE%/*}/../macos/fix_relative_dependencies.sh"

xcode_major_version=$(xcodebuild -version | awk 'NR==1 {split($2, a, "."); print a[1]}')
if [ "$xcode_major_version" -ge 15 ]; then
# fix the error: duplicate symbol '_av_ac3_parse_header'
ffmpeg_config_options+=" --extra-ldflags=-Wl,-ld_classic"
fi

if [ "$os" == "macos" ]; then
build_ffmpeg
install_dir="$ffmpeg_source_dir/build/installed"
Expand Down

0 comments on commit 3b9fea6

Please sign in to comment.