summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorDamjan Marion <damarion@cisco.com>2021-09-30 20:04:14 +0200
committerFlorin Coras <florin.coras@gmail.com>2021-10-05 16:44:32 +0000
commit5546e43f7943d6edff6c6587ed4e7233e8002e28 (patch)
tree16b4a8ce7a63c4cf1ce7f367b0d0f1d9268f2849 /Makefile
parentefd967faff168d037066b6e6824d2a579adbef93 (diff)
build: don't hardcode triplet, allow specifying custom lib dir
Type: fix Change-Id: I33f364fda88914f88f9b976cb83e6d3ff466f0bb Signed-off-by: Damjan Marion <damarion@cisco.com> Signed-off-by: Ray Kinsella <mdr@ashroe.eu>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile5
1 files changed, 0 insertions, 5 deletions
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) \