From: Luiz Angelo Daros de Luca <redacted>
Date: Mon, 29 Apr 2019 18:05:18 +0000 (-0300)
Subject: libvpx: cleanup configure/make vars
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=e1a2057f64c94fc85c0b4ee20572423365ab0814;p=openwrt-packages.git

libvpx: cleanup configure/make vars

Instead of redefining LD (and duplicating it), it is better to
unset the existing value first.

Signed-off-by: Luiz Angelo Daros de Luca <redacted>
---

diff --git a/libs/libvpx/Makefile b/libs/libvpx/Makefile
index d43a5ca77..81ad4cd36 100644
--- a/libs/libvpx/Makefile
+++ b/libs/libvpx/Makefile
@@ -62,12 +62,9 @@ endif
 
 # libvpx expects gcc as linker but uses $LD if provided
 # However, OpenWRT defines LD as *-uclibc-ld and not *-gcc
-CONFIGURE_VARS += \
-    CROSS=$(GNU_TARGET_NAME) \
-	LD="$(TARGET_CC)" \
-
-MAKE_FLAGS += \
-	LD="$(TARGET_CC)" \
+CONFIGURE_VARS := $(filter-out LD=%,$(CONFIGURE_VARS)) LD="$(TARGET_CC)" \
+       CROSS=$(GNU_TARGET_NAME)
+MAKE_FLAGS := $(filter-out LD=%,$(MAKE_FLAGS)) LD="$(TARGET_CC)"
 
 define Build/InstallDev
 	$(INSTALL_DIR) $(1)/usr/include/vpx/