[vlc-commits] contribs: main.mak: Don't override CC/CXX if already provided
    Hugo Beauzée-Luyssen 
    git at videolan.org
       
    Fri Apr 21 15:15:07 CEST 2017
    
    
  
vlc | branch: master | Hugo Beauzée-Luyssen <hugo at beauzee.fr> | Thu Apr 20 16:28:41 2017 +0200| [3e21c65b32cab90edee1baa0b4e951d64c83a342] | committer: Hugo Beauzée-Luyssen
contribs: main.mak: Don't override CC/CXX if already provided
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=3e21c65b32cab90edee1baa0b4e951d64c83a342
---
 contrib/src/main.mak | 4 ++++
 1 file changed, 4 insertions(+)
diff --git a/contrib/src/main.mak b/contrib/src/main.mak
index 6f822d967d..9f49f266ed 100644
--- a/contrib/src/main.mak
+++ b/contrib/src/main.mak
@@ -101,9 +101,13 @@ endif
 endif
 
 ifdef HAVE_ANDROID
+ifneq ($(findstring $(origin CC),undefined default),)
 CC :=  clang
+endif
+ifneq ($(findstring $(origin CXX),undefined default),)
 CXX := clang++
 endif
+endif
 
 ifdef HAVE_MACOSX
 MIN_OSX_VERSION=10.7
    
    
More information about the vlc-commits
mailing list