Look for plugins in target triplet subdir

Change-Id: I3bab0ab05b4f552ad64392439fb48409ab0ab8c0
Signed-off-by: Damjan Marion <damarion@cisco.com>

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index b404b50..59da1fe 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -41,6 +41,7 @@ if(CMAKE_CROSSCOMPILING)
     /usr/lib/${CMAKE_HOST_SYSTEM_PROCESSOR}-linux-gnu/lib/
   )
 endif()
+set(CMAKE_C_COMPILER_TARGET ${CMAKE_SYSTEM_PROCESSOR}-linux-gnu)
 
 ##############################################################################
 # build config

diff --git a/src/vpp/vnet/main.c b/src/vpp/vnet/main.c
index 41f70d0..6819ae6 100644 (file)
--- a/src/vpp/vnet/main.c
+++ b/src/vpp/vnet/main.c
@@ -57,11 +57,13 @@ vpp_find_plugin_path ()
     return;
   *p = 0;
 
-  s = format (0, "%s/lib/vpp_plugins", path);
+  s = format (0, "%s/lib/" CLIB_TARGET_TRIPLET "/vpp_plugins:"
+             "%s/lib/vpp_plugins", path, path);
   vec_add1 (s, 0);
   vlib_plugin_path = (char *) s;
 
-  s = format (0, "%s/lib/vpp_api_test_plugins", path);
+  s = format (0, "%s/lib/" CLIB_TARGET_TRIPLET "/vpp_api_test_plugins:"
+             "%s/lib/vpp_api_test_plugins", path, path);
   vec_add1 (s, 0);
   vat_plugin_path = (char *) s;
 }

diff --git a/src/vppinfra/config.h.in b/src/vppinfra/config.h.in
index 58a9731..a7a22a6 100644 (file)
--- a/src/vppinfra/config.h.in
+++ b/src/vppinfra/config.h.in
@@ -21,4 +21,6 @@
 #endif
 
 #define USE_DLMALLOC @DLMALLOC@
+
+#define CLIB_TARGET_TRIPLET "@CMAKE_C_COMPILER_TARGET@"
 #endif