vlc | branch: master | Alexandre Janniaux <[email protected]> | Fri Apr 24 
17:02:04 2020 +0200| [da8e12742bc60780e68255e1238adc85608eec4d] | committer: 
Alexandre Janniaux

contrib: main: ensure NM is defined in makefile

ffmpeg rules.make is passing the variable to configure, and nm can be
present in different flavour, for example in linux/macosx
cross-compilation environments.

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

 contrib/src/main.mak | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/contrib/src/main.mak b/contrib/src/main.mak
index 0a731f11dc..534f1d1134 100644
--- a/contrib/src/main.mak
+++ b/contrib/src/main.mak
@@ -70,6 +70,7 @@ endif
 ifneq ($(findstring $(origin AR),undefined default),)
 AR := ar
 endif
+NM ?= nm
 RANLIB ?= ranlib
 STRIP ?= strip
 WIDL ?= widl
@@ -88,6 +89,7 @@ endif
 ifneq ($(findstring $(origin AR),undefined default),)
 AR := $(HOST)-ar
 endif
+NM ?= $(HOST)-nm
 RANLIB ?= $(HOST)-ranlib
 STRIP ?= $(HOST)-strip
 WIDL ?= $(HOST)-widl

_______________________________________________
vlc-commits mailing list
[email protected]
https://mailman.videolan.org/listinfo/vlc-commits

Reply via email to