[vlc-commits] contrib: lua: Make the win32 makefile patching stricter

Martin Storsjö git at videolan.org
Fri Nov 23 16:10:39 CET 2018


vlc/vlc-3.0 | branch: master | Martin Storsjö <martin at martin.st> | Sat Jun 16 12:28:20 2018 +0300| [92033220233ceb6ac0414c09ab4ad1cddb1edf19] | committer: Hugo Beauzée-Luyssen

contrib: lua: Make the win32 makefile patching stricter

This fixes building for armv7, broken in a3d1527e.

The "= ar" pattern could match any case of an armv7
prefixed tool, like "RANLIB= armv7-w64-mingw32-...".

(cherry picked from commit fcd1a0bebde89591c87e3aec8773ef8ad14fd306)
Signed-off-by: Hugo Beauzée-Luyssen <hugo at beauzee.fr>

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

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

diff --git a/contrib/src/lua/rules.mak b/contrib/src/lua/rules.mak
index b432edd34a..7d0149a280 100644
--- a/contrib/src/lua/rules.mak
+++ b/contrib/src/lua/rules.mak
@@ -68,7 +68,7 @@ endif
 		-e 's%CC=%#CC=%' \
 		-e 's%= *strip%=$(STRIP)%' \
 		-e 's%= *ranlib%= $(RANLIB)%' \
-		-e 's%= *ar%= $(AR)%' \
+		-e 's%AR= *ar%AR= $(AR)%' \
 		Makefile
 	$(MOVE)
 



More information about the vlc-commits mailing list