[vlc-devel] [PATCH 4/7] contrib: main.mak: use AR for cmake unconditionnally

Alexandre Janniaux ajanni at videolabs.io
Fri Apr 24 17:02:02 CEST 2020


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.
---
 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 708885cdec..df343ffc90 100644
--- a/contrib/src/main.mak
+++ b/contrib/src/main.mak
@@ -576,15 +576,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
+endif
 	echo "set(CMAKE_AR $(AR) CACHE FILEPATH \"Archiver\")" >> $@
-endif
 ifdef HAVE_CROSS_COMPILE
 	echo "set(_CMAKE_TOOLCHAIN_PREFIX $(HOST)-)" >> $@
 ifdef HAVE_ANDROID
-- 
2.26.1



More information about the vlc-devel mailing list