[vlc-commits] contrib: set the AR variable explicitly in CMake

Steve Lhomme git at videolan.org
Thu Jun 18 18:31:36 CEST 2020


vlc/vlc-3.0 | branch: master | Steve Lhomme <robux4 at ycbcr.xyz> | Tue Nov 27 09:36:00 2018 +0100| [dfccf268a9742c14701d7ad4eab3aa5119447cda] | committer: Steve Lhomme

contrib: set the AR variable explicitly in CMake

It doesn't inherit it properly in MSys2 (at least) and fails to build.

It shouldn't cause any problems on system where it already works.

(cherry picked from commit 3c54c93f14a74ece6747e6a98d5d4aa6f2d46196)

Signed-off-by: Steve Lhomme <robux4 at ycbcr.xyz>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=dfccf268a9742c14701d7ad4eab3aa5119447cda
---

 contrib/src/main.mak | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/contrib/src/main.mak b/contrib/src/main.mak
index b9d6da0d85..0eb5e8809a 100644
--- a/contrib/src/main.mak
+++ b/contrib/src/main.mak
@@ -539,6 +539,8 @@ ifdef HAVE_IOS
 else
 	echo "set(CMAKE_OSX_SYSROOT $(MACOSX_SDK))" >> $@
 endif
+else
+	echo "set(CMAKE_AR $(AR) CACHE FILEPATH "Archiver")" >> $@
 endif
 ifdef HAVE_CROSS_COMPILE
 	echo "set(_CMAKE_TOOLCHAIN_PREFIX $(HOST)-)" >> $@



More information about the vlc-commits mailing list