[vlc-commits] contrib: Simplify HOSTVARS assignment
Marvin Scholz
git at videolan.org
Wed Jun 19 13:11:49 CEST 2019
vlc | branch: master | Marvin Scholz <epirat07 at gmail.com> | Wed Jun 19 11:44:04 2019 +0200| [bef7c8d601b2ced95eac7db50380de4f8ba10ddb] | committer: Marvin Scholz
contrib: Simplify HOSTVARS assignment
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=bef7c8d601b2ced95eac7db50380de4f8ba10ddb
---
contrib/src/main.mak | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/contrib/src/main.mak b/contrib/src/main.mak
index 7ce175316d..5ad7ff59a8 100644
--- a/contrib/src/main.mak
+++ b/contrib/src/main.mak
@@ -317,7 +317,7 @@ HOSTTOOLS := \
CC="$(CC)" CXX="$(CXX)" LD="$(LD)" \
AR="$(AR)" CCAS="$(CCAS)" RANLIB="$(RANLIB)" STRIP="$(STRIP)" \
PATH="$(PREFIX)/bin:$(PATH)"
-HOSTVARS := \
+HOSTVARS := $(HOSTTOOLS) \
CPPFLAGS="$(CPPFLAGS)" \
CFLAGS="$(CFLAGS)" \
CXXFLAGS="$(CXXFLAGS)" \
@@ -333,11 +333,9 @@ HOSTVARS_PIC := $(HOSTTOOLS) \
ifdef HAVE_CROSS_COMPILE
HOSTVARS_MESON := PATH="$(PREFIX)/bin:$(PATH)"
else
-HOSTVARS_MESON := $(HOSTTOOLS) $(HOSTVARS)
+HOSTVARS_MESON := $(HOSTVARS)
endif
-HOSTVARS := $(HOSTTOOLS) $(HOSTVARS)
-
download_git = \
rm -Rf -- "$(@:.tar.xz=)" && \
$(GIT) init --bare "$(@:.tar.xz=)" && \
More information about the vlc-commits
mailing list