From 2a65804259e8c139c2d556f1c3e95f435280b4d2 Mon Sep 17 00:00:00 2001 From: Aloys Augustin Date: Tue, 13 Oct 2020 15:43:00 +0200 Subject: build: forward dependencies to arch-specific libs Without this, if a multiarch source depends on a generated api header for instance, the build would be racy between the api header generation and the multiarch object compilation. Type: improvement Signed-off-by: Aloys Augustin Change-Id: I08fcd0e5a1c51398ac1a8f37cf6562064b400d4a --- src/cmake/cpu.cmake | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'src/cmake/cpu.cmake') diff --git a/src/cmake/cpu.cmake b/src/cmake/cpu.cmake index c7ad1a4a0bc..37bc24c09b5 100644 --- a/src/cmake/cpu.cmake +++ b/src/cmake/cpu.cmake @@ -121,12 +121,15 @@ elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(aarch64.*|AARCH64.*)") endif() endif() -macro(vpp_library_set_multiarch_sources lib) +macro(vpp_library_set_multiarch_sources lib deps) foreach(V ${MARCH_VARIANTS}) list(GET V 0 VARIANT) list(GET V 1 VARIANT_FLAGS) set(l ${lib}_${VARIANT}) add_library(${l} OBJECT ${ARGN}) + if("${deps}") + add_dependencies(${l} ${deps}) + endif() set_target_properties(${l} PROPERTIES POSITION_INDEPENDENT_CODE ON) target_compile_options(${l} PUBLIC "-DCLIB_MARCH_VARIANT=${VARIANT}") separate_arguments(VARIANT_FLAGS) -- cgit 1.2.3-korg