Commit 1f99b770 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

Revert "contrib: pass the LD we use to ffmpeg"

This reverts commit fabb0362.

For some reasons, this was breaking Android toolchains
parent c358dd00
...@@ -170,7 +170,7 @@ ifeq ($(call need_pkg,"libavcodec >= 55.0.0 libavformat >= 53.21.0 libswscale"), ...@@ -170,7 +170,7 @@ ifeq ($(call need_pkg,"libavcodec >= 55.0.0 libavformat >= 53.21.0 libswscale"),
PKGS_FOUND += ffmpeg PKGS_FOUND += ffmpeg
endif endif
FFMPEGCONF += --nm="$(NM)" --ar="$(AR)" --ld="$(LD)" FFMPEGCONF += --nm="$(NM)" --ar="$(AR)"
$(TARBALLS)/ffmpeg-$(HASH).tar.xz: $(TARBALLS)/ffmpeg-$(HASH).tar.xz:
$(call download_git,$(FFMPEG_GITURL),,$(HASH)) $(call download_git,$(FFMPEG_GITURL),,$(HASH))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment