[vlc-commits] contrib: make HAVE_CLANG a global define

Konstantin Pavlov git at videolan.org
Thu Jun 18 18:31:54 CEST 2020


vlc/vlc-3.0 | branch: master | Konstantin Pavlov <thresh at videolan.org> | Wed May 22 12:44:30 2019 +0300| [5daf1a0437bda3cca97f8888429b4c696dea2c0b] | committer: Steve Lhomme

contrib: make HAVE_CLANG a global define

(cherry picked from commit 279768570763f8c0d8c3dfb3c4cc94f0fba09388) (rebased)

rebased:
- this branch didn't have winstorecompat (8a7939228feef676cfafd5cd45d2fea9c4bb941f)

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

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

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

diff --git a/contrib/src/main.mak b/contrib/src/main.mak
index 9017826e28..f570a733a3 100644
--- a/contrib/src/main.mak
+++ b/contrib/src/main.mak
@@ -153,9 +153,6 @@ endif
 ifndef HAVE_CROSS_COMPILE
 LN_S = cp -R
 endif
-ifneq ($(findstring clang, $(shell $(CC) --version)),)
-HAVE_CLANG := 1
-endif
 endif
 
 ifdef HAVE_SOLARIS
@@ -168,6 +165,10 @@ EXTRA_LDFLAGS += -m32
 endif
 endif
 
+ifneq ($(findstring clang, $(shell $(CC) --version)),)
+HAVE_CLANG := 1
+endif
+
 cppcheck = $(shell $(CC) $(CFLAGS) -E -dM - < /dev/null | grep -E $(1))
 
 EXTRA_CFLAGS += -I$(PREFIX)/include



More information about the vlc-commits mailing list