From 5546e43f7943d6edff6c6587ed4e7233e8002e28 Mon Sep 17 00:00:00 2001 From: Damjan Marion Date: Thu, 30 Sep 2021 20:04:14 +0200 Subject: build: don't hardcode triplet, allow specifying custom lib dir Type: fix Change-Id: I33f364fda88914f88f9b976cb83e6d3ff466f0bb Signed-off-by: Damjan Marion Signed-off-by: Ray Kinsella --- Makefile | 5 ----- 1 file changed, 5 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 5c16b9a317c..28e44ce9095 100644 --- a/Makefile +++ b/Makefile @@ -377,8 +377,6 @@ wipe-release: test-wipe $(BR)/.deps.ok .PHONY: rebuild-release rebuild-release: wipe-release build-release -libexpand = $(subst $(subst ,, ),:,$(foreach lib,$(1),$(BR)/install-$(2)-native/vpp/$(lib)/$(3))) - export TEST_DIR ?= $(WS_ROOT)/test export RND_SEED ?= $(shell python3 -c 'import time; print(time.time())') @@ -388,10 +386,7 @@ define test make -C test \ VPP_BUILD_DIR=$(BR)/build-$(2)-native \ VPP_BIN=$(BR)/install-$(2)-native/vpp/bin/vpp \ - VPP_PLUGIN_PATH=$(call libexpand,$(libs),$(2),vpp_plugins) \ - VPP_TEST_PLUGIN_PATH=$(call libexpand,$(libs),$(2),vpp_api_test_plugins) \ VPP_INSTALL_PATH=$(BR)/install-$(2)-native/ \ - LD_LIBRARY_PATH=$(call libexpand,$(libs),$(2),) \ EXTENDED_TESTS=$(EXTENDED_TESTS) \ PYTHON=$(PYTHON) \ OS_ID=$(OS_ID) \ -- cgit 1.2.3-korg