From da8e12742bc60780e68255e1238adc85608eec4d Mon Sep 17 00:00:00 2001 From: Alexandre Janniaux <ajanni@videolabs.io> Date: Fri, 24 Apr 2020 17:02:04 +0200 Subject: [PATCH] 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. --- contrib/src/main.mak | 2 ++ 1 file changed, 2 insertions(+) diff --git a/contrib/src/main.mak b/contrib/src/main.mak index 0a731f11dcc3..534f1d113490 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 -- GitLab