[vlc-commits] contrib: main.mak: use AR for cmake unconditionnally

[Alexandre Janniaux]

vlc | branch: master | Alexandre Janniaux <ajanni at videolabs.io> | Fri Apr 24 17:02:02 2020 +0200| [df48dd596aee1135ad5c17eef25653380f266881] | committer: Alexandre Janniaux

contrib: main.mak: use AR for cmake unconditionnally

The pain point was that $(HOST)-ar doesn't exist on MacOSX as there is
no triplet-prefixed tools. This has become useless as we now enforce the
correct variant through `xcrun --find` in apple buildscripts.

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

 contrib/src/main.mak | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/contrib/src/main.mak b/contrib/src/main.mak
index 534f1d1134..f008b20a99 100644
--- a/contrib/src/main.mak
+++ b/contrib/src/main.mak
@@ -582,15 +582,13 @@ ifdef HAVE_DARWIN_OS
 	echo "set(CMAKE_C_FLAGS \"$(CFLAGS)\")" >> $@
 	echo "set(CMAKE_CXX_FLAGS \"$(CXXFLAGS)\")" >> $@
 	echo "set(CMAKE_LD_FLAGS \"$(LDFLAGS)\")" >> $@
-	echo "set(CMAKE_AR ar CACHE FILEPATH \"Archiver\")" >> $@
 ifdef HAVE_IOS
 	echo "set(CMAKE_OSX_SYSROOT $(IOS_SDK))" >> $@
 else
 	echo "set(CMAKE_OSX_SYSROOT $(MACOSX_SDK))" >> $@
 endif
-else
-	echo "set(CMAKE_AR $(AR) CACHE FILEPATH \"Archiver\")" >> $@
 endif
+	echo "set(CMAKE_AR $(AR) CACHE FILEPATH \"Archiver\")" >> $@
 ifdef HAVE_CROSS_COMPILE
 	echo "set(_CMAKE_TOOLCHAIN_PREFIX $(HOST)-)" >> $@
 ifdef HAVE_ANDROID