[vlc-commits] contrib: set archive tool for cmake on OSX too

Vittorio Giovara git at videolan.org
Wed Jul 2 21:17:28 CEST 2014


vlc/vlc-2.2 | branch: master | Vittorio Giovara <vittorio.giovara at gmail.com> | Mon Jun 30 15:04:21 2014 -0400| [9396fb6e4d098447afec195b9b7b01a664378efb] | committer: Felix Paul Kühne

contrib: set archive tool for cmake on OSX too

Signed-off-by: Rafaël Carré <funman at videolan.org>
(cherry picked from commit 3ba6497f6fa3ef219d387a79f1c4552071313c44)
Signed-off-by: Felix Paul Kühne <fkuehne at videolan.org>

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

 contrib/src/main.mak |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contrib/src/main.mak b/contrib/src/main.mak
index bc8743f..dd2bd25 100644
--- a/contrib/src/main.mak
+++ b/contrib/src/main.mak
@@ -413,8 +413,8 @@ ifdef HAVE_DARWIN_OS
 	echo "set(CMAKE_C_FLAGS $(CFLAGS))" >> $@
 	echo "set(CMAKE_CXX_FLAGS $(CFLAGS))" >> $@
 	echo "set(CMAKE_LD_FLAGS $(LDFLAGS))" >> $@
-ifdef HAVE_IOS
 	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))" >> $@



More information about the vlc-commits mailing list