Commit 5e239540 authored by GitLab CI's avatar GitLab CI

Merge remote-tracking branch 'upstream/master' into master-build

* upstream/master:
  contrib: Use `ranlib` instead of `ar s` to fix building on Ubuntu 19.10 and Debian Sid Unstable.
parents cd3223cd 6258ed52
......@@ -52,5 +52,5 @@ define X265.LINK
for a in $(X265.SOURCE.libs); do \
($(RM.exe) -rf "$$a"_o && $(MKDIR.exe) -p "$$a"_o && $(AR.exe) x "$$a" && $(MV.exe) *$(X265.O.ext) "$$a"_o && $(AR.exe) cq $@ "$$a"_o/*$(X265.O.ext)); \
done
$(AR.exe) s $@
$(RANLIB.exe) $@
endef
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