[vlc-devel] [PATCH v2 01/13] contrib: lua: only set LUACVARS once
Steve Lhomme
robux4 at ycbcr.xyz
Tue Mar 24 15:46:19 CET 2020
Both case are exclusive. No need to keep this confusion.
---
contrib/src/lua/rules.mak | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/contrib/src/lua/rules.mak b/contrib/src/lua/rules.mak
index d0ce491c91..c6af47bf04 100644
--- a/contrib/src/lua/rules.mak
+++ b/contrib/src/lua/rules.mak
@@ -88,17 +88,15 @@ endif
.sum-luac: .sum-lua
touch $@
+ifdef HAVE_CROSS_COMPILE
+# Remove the cross-compiler environment for the native compiler
+LUACVARS=CFLAGS="" CPPFLAGS="" LDFLAGS=""
+else
ifdef HAVE_WIN32
-ifndef HAVE_CROSS_COMPILE
LUACVARS=CPPFLAGS="-DLUA_DL_DLL"
endif
endif
-ifdef HAVE_CROSS_COMPILE
-# Remove the cross-compiler environment for the native compiler
-LUACVARS+=CFLAGS="" CPPFLAGS="" LDFLAGS=""
-endif
-
luac: lua-$(LUA_VERSION).tar.gz .sum-luac
# DO NOT use the same intermediate directory as the lua target
rm -Rf -- $@-$(LUA_VERSION) $@
--
2.17.1
More information about the vlc-devel
mailing list