src: Move the decision to build the ISA plugin to the top level make file

Previously, the first time you build ceph, common did not see the correct
value of WITH_EC_ISA_PLUGIN.  The consequence is that the global.yaml gets
build with osd_erasure_code_plugins not including isa.  This is not great
given its our default plugin.

We considered simply removing this parameter from make entirely, but this
may require more discussion about supporting old hardware.

So the slightly ugly fix is to move this erasure-code specific declartion
to the top-level.

Fixes: https://tracker.ceph.com/issues/75537
Signed-off-by: Alex Ainscow <aainscow@uk.ibm.com>

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index acdcea4464fdd1df47e35fdbaa5918ee51ca7636..c99894cf93bc002c82a5380683992c6a92773d0b 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -242,6 +242,12 @@ if(HAVE_INTEL)
   endif()
 endif()
 
+# Set WITH_EC_ISA_PLUGIN early so it's available when processing common/options
+# This must be set before add_subdirectory(common) is called
+if(HAVE_NASM_X64_AVX2 OR HAVE_ARMV8_SIMD OR HAS_ALTIVEC)
+  set(WITH_EC_ISA_PLUGIN TRUE CACHE BOOL "")
+endif()
+
 # require c++23
 set(CMAKE_CXX_STANDARD 23)
 set(CMAKE_CXX_EXTENSIONS OFF)

diff --git a/src/erasure-code/CMakeLists.txt b/src/erasure-code/CMakeLists.txt
index 8d170d14dc5d46270f7c140d258fabd58995e253..cc5a84e9dc1bea1c543d8ca69bf6ab3f07c4fec5 100644 (file)
--- a/src/erasure-code/CMakeLists.txt
+++ b/src/erasure-code/CMakeLists.txt
@@ -23,10 +23,6 @@ add_subdirectory(shec)
 add_subdirectory(clay)
 add_subdirectory(consistency)
 
-if(HAVE_NASM_X64_AVX2 OR HAVE_ARMV8_SIMD OR HAS_ALTIVEC)
-  set(WITH_EC_ISA_PLUGIN TRUE CACHE BOOL "")
-endif()
-
 if(WITH_EC_ISA_PLUGIN)
   add_subdirectory(isa)
   set(EC_ISA_LIB ec_isa)