cmake: module: llext: Add CONFIG_LLEXT check to all module build scripts

softwarecki · lgirdwood · commit 8355a53ea73c · 2025-09-30T17:21:04.000+01:00
Ensure that modules are only built as llext when CONFIG_LLEXT is enabled.

Previously, if a module was configured to be built as a loadable
module (config option set to 'm') while CONFIG_LLEXT was disabled,
the build would fail due to missing support for llext.

This change adds a conditional check to all relevant CMake files
to prevent such errors. It aligns module building behavior with
CONFIG_LIBRARY_DEFAULT_MODULAR, which controls whether modules
are built as loadable by default. The default behavior depends
on whether CONFIG_LLEXT is enabled in the configuration.

Signed-off-by: Adrian Warecki &lt;adrian.warecki@intel.com&gt;
diff --git a/src/audio/aria/CMakeLists.txt b/src/audio/aria/CMakeLists.txt
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: BSD-3-Clause
 
-if(CONFIG_COMP_ARIA STREQUAL "m")
+if(CONFIG_COMP_ARIA STREQUAL "m" AND DEFINED CONFIG_LLEXT)
   add_subdirectory(llext ${PROJECT_BINARY_DIR}/aria_llext)
   add_dependencies(app aria)
 else()
diff --git a/src/audio/asrc/CMakeLists.txt b/src/audio/asrc/CMakeLists.txt
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: BSD-3-Clause
 
-if(CONFIG_COMP_ASRC STREQUAL "m")
+if(CONFIG_COMP_ASRC STREQUAL "m" AND DEFINED CONFIG_LLEXT)
   add_subdirectory(llext ${PROJECT_BINARY_DIR}/asrc_llext)
   add_dependencies(app asrc)
   return()
diff --git a/src/audio/codec/CMakeLists.txt b/src/audio/codec/CMakeLists.txt
@@ -3,7 +3,7 @@
 is_zephyr(zephyr)
 if(zephyr) ###  Zephyr ###
 
-  if(CONFIG_DTS_CODEC STREQUAL "m")
+  if(CONFIG_DTS_CODEC STREQUAL "m" AND DEFINED CONFIG_LLEXT)
     add_subdirectory(dts/llext ${PROJECT_BINARY_DIR}/dts_llext)
     add_dependencies(app dts)
 
diff --git a/src/audio/crossover/CMakeLists.txt b/src/audio/crossover/CMakeLists.txt
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: BSD-3-Clause
 
-if(CONFIG_COMP_CROSSOVER STREQUAL "m")
+if(CONFIG_COMP_CROSSOVER STREQUAL "m" AND DEFINED CONFIG_LLEXT)
   add_subdirectory(llext ${PROJECT_BINARY_DIR}/crossover_llext)
   add_dependencies(app crossover)
   return()
diff --git a/src/audio/dcblock/CMakeLists.txt b/src/audio/dcblock/CMakeLists.txt
@@ -1,4 +1,4 @@
-if(CONFIG_COMP_DCBLOCK STREQUAL "m")
+if(CONFIG_COMP_DCBLOCK STREQUAL "m" AND DEFINED CONFIG_LLEXT)
   add_subdirectory(llext ${PROJECT_BINARY_DIR}/dcblock_llext)
   add_dependencies(app dcblock)
   return()
diff --git a/src/audio/drc/CMakeLists.txt b/src/audio/drc/CMakeLists.txt
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: BSD-3-Clause
 
-if(CONFIG_COMP_DRC STREQUAL "m")
+if(CONFIG_COMP_DRC STREQUAL "m" AND DEFINED CONFIG_LLEXT)
   add_subdirectory(llext ${PROJECT_BINARY_DIR}/drc_llext)
   add_dependencies(app drc)
 else()
diff --git a/src/audio/eq_fir/CMakeLists.txt b/src/audio/eq_fir/CMakeLists.txt
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: BSD-3-Clause
 
-if(CONFIG_COMP_FIR STREQUAL "m")
+if(CONFIG_COMP_FIR STREQUAL "m" AND DEFINED CONFIG_LLEXT)
 
   add_subdirectory(llext ${PROJECT_BINARY_DIR}/eq_fir_llext)
   add_dependencies(app eq_fir)
diff --git a/src/audio/eq_iir/CMakeLists.txt b/src/audio/eq_iir/CMakeLists.txt
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: BSD-3-Clause
 
-if(CONFIG_COMP_IIR STREQUAL "m")
+if(CONFIG_COMP_IIR STREQUAL "m" AND DEFINED CONFIG_LLEXT)
 
   add_subdirectory(llext ${PROJECT_BINARY_DIR}/eq_iir_llext)
   add_dependencies(app eq_iir)
diff --git a/src/audio/google/CMakeLists.txt b/src/audio/google/CMakeLists.txt
@@ -14,7 +14,7 @@ if(zephyr) ###  Zephyr ###
 		google_hotword_detect.c
 	)
 
-	if(CONFIG_COMP_GOOGLE_RTC_AUDIO_PROCESSING STREQUAL "m")
+	if(CONFIG_COMP_GOOGLE_RTC_AUDIO_PROCESSING STREQUAL "m" AND DEFINED CONFIG_LLEXT)
 		add_subdirectory(llext_rtc
 				 ${PROJECT_BINARY_DIR}/google_rtc_audio_processing_llext)
 		add_dependencies(app google_rtc_audio_processing)
@@ -37,7 +37,7 @@ if(zephyr) ###  Zephyr ###
 		endif()
 	endif()
 
-	if(CONFIG_COMP_GOOGLE_CTC_AUDIO_PROCESSING STREQUAL "m")
+	if(CONFIG_COMP_GOOGLE_CTC_AUDIO_PROCESSING STREQUAL "m" AND DEFINED CONFIG_LLEXT)
 		add_subdirectory(llext_ctc
 				 ${PROJECT_BINARY_DIR}/google_ctc_audio_processing_llext)
 		add_dependencies(app google_ctc_audio_processing)
diff --git a/src/audio/igo_nr/CMakeLists.txt b/src/audio/igo_nr/CMakeLists.txt
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: BSD-3-Clause
 
-if(CONFIG_COMP_IGO_NR STREQUAL "m")
+if(CONFIG_COMP_IGO_NR STREQUAL "m" AND DEFINED CONFIG_LLEXT)
   add_subdirectory(llext ${PROJECT_BINARY_DIR}/igo_nr_llext)
   add_dependencies(app igo_nr)
   return()
diff --git a/src/audio/level_multiplier/CMakeLists.txt b/src/audio/level_multiplier/CMakeLists.txt
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: BSD-3-Clause
 
-if(CONFIG_COMP_LEVEL_MULTIPLIER STREQUAL "m")
+if(CONFIG_COMP_LEVEL_MULTIPLIER STREQUAL "m" AND DEFINED CONFIG_LLEXT)
   add_subdirectory(llext ${PROJECT_BINARY_DIR}/level_multiplier_llext)
   add_dependencies(app level_multiplier)
 else()
diff --git a/src/audio/mfcc/CMakeLists.txt b/src/audio/mfcc/CMakeLists.txt
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: BSD-3-Clause
 
-if(CONFIG_COMP_MFCC STREQUAL "m")
+if(CONFIG_COMP_MFCC STREQUAL "m" AND DEFINED CONFIG_LLEXT)
   add_subdirectory(llext ${PROJECT_BINARY_DIR}/mfcc_llext)
   add_dependencies(app mfcc)
 else()
diff --git a/src/audio/mixin_mixout/CMakeLists.txt b/src/audio/mixin_mixout/CMakeLists.txt
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: BSD-3-Clause
 
-if(CONFIG_COMP_MIXIN_MIXOUT STREQUAL "m")
+if(CONFIG_COMP_MIXIN_MIXOUT STREQUAL "m" AND DEFINED CONFIG_LLEXT)
 
   add_subdirectory(llext ${PROJECT_BINARY_DIR}/mixin_mixout_llext)
   add_dependencies(app mixin_mixout)
diff --git a/src/audio/module_adapter/CMakeLists.txt b/src/audio/module_adapter/CMakeLists.txt
@@ -48,7 +48,7 @@ if(zephyr) ###  Zephyr ###
 
 	if(CONFIG_WAVES_CODEC)
 		set(WAVES_DIR module/waves)
-		if(CONFIG_WAVES_CODEC STREQUAL "m")
+		if(CONFIG_WAVES_CODEC STREQUAL "m" AND DEFINED CONFIG_LLEXT)
 			add_subdirectory(${WAVES_DIR}/llext ${PROJECT_BINARY_DIR}/waves_llext)
 			add_dependencies(app waves)
 		else()
diff --git a/src/audio/multiband_drc/CMakeLists.txt b/src/audio/multiband_drc/CMakeLists.txt
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: BSD-3-Clause
 
-if(CONFIG_COMP_MULTIBAND_DRC STREQUAL "m")
+if(CONFIG_COMP_MULTIBAND_DRC STREQUAL "m" AND DEFINED CONFIG_LLEXT)
   add_subdirectory(llext ${PROJECT_BINARY_DIR}/multiband_drc_llext)
   add_dependencies(app multiband_drc)
 else()
diff --git a/src/audio/mux/CMakeLists.txt b/src/audio/mux/CMakeLists.txt
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: BSD-3-Clause
 
-if(CONFIG_COMP_MUX STREQUAL "m")
+if(CONFIG_COMP_MUX STREQUAL "m" AND DEFINED CONFIG_LLEXT)
   add_subdirectory(llext ${PROJECT_BINARY_DIR}/mux_llext)
   add_dependencies(app mux)
 else()
diff --git a/src/audio/rtnr/CMakeLists.txt b/src/audio/rtnr/CMakeLists.txt
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: BSD-3-Clause
 
-if(CONFIG_COMP_RTNR STREQUAL "m")
+if(CONFIG_COMP_RTNR STREQUAL "m" AND DEFINED CONFIG_LLEXT)
   add_subdirectory(llext ${PROJECT_BINARY_DIR}/rtnr_llext)
   add_dependencies(app rtnr)
   return()
diff --git a/src/audio/selector/CMakeLists.txt b/src/audio/selector/CMakeLists.txt
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: BSD-3-Clause
 
-if(CONFIG_COMP_SEL STREQUAL "m")
+if(CONFIG_COMP_SEL STREQUAL "m" AND DEFINED CONFIG_LLEXT)
   add_subdirectory(llext ${PROJECT_BINARY_DIR}/selector_llext)
   add_dependencies(app selector)
   return()
diff --git a/src/audio/src/CMakeLists.txt b/src/audio/src/CMakeLists.txt
@@ -13,7 +13,7 @@ sof_list_append_ifdef(CONFIG_COMP_SRC_LITE base_files src_lite.c)
 is_zephyr(zephyr)
 if(zephyr) ###  Zephyr ###
 
-  if(CONFIG_COMP_SRC STREQUAL "m")
+  if(CONFIG_COMP_SRC STREQUAL "m" AND DEFINED CONFIG_LLEXT)
 
     add_subdirectory(llext ${PROJECT_BINARY_DIR}/src_llext)
     add_dependencies(app src)
diff --git a/src/audio/tdfb/CMakeLists.txt b/src/audio/tdfb/CMakeLists.txt
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: BSD-3-Clause
 
-if(CONFIG_COMP_TDFB STREQUAL "m")
+if(CONFIG_COMP_TDFB STREQUAL "m" AND DEFINED CONFIG_LLEXT)
   add_subdirectory(llext ${PROJECT_BINARY_DIR}/tdfb_llext)
   add_dependencies(app tdfb)
 else()
diff --git a/src/audio/template/CMakeLists.txt b/src/audio/template/CMakeLists.txt
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: BSD-3-Clause
 
-if(CONFIG_COMP_TEMPLATE STREQUAL "m")
+if(CONFIG_COMP_TEMPLATE STREQUAL "m" AND DEFINED CONFIG_LLEXT)
   add_subdirectory(llext ${PROJECT_BINARY_DIR}/template_llext)
   add_dependencies(app template)
 else()
diff --git a/src/audio/tensorflow/CMakeLists.txt b/src/audio/tensorflow/CMakeLists.txt
@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 # are we building the llext module ?
-if(CONFIG_COMP_TENSORFLOW STREQUAL "m")
+if(CONFIG_COMP_TENSORFLOW STREQUAL "m" AND DEFINED CONFIG_LLEXT)
   add_subdirectory(llext ${PROJECT_BINARY_DIR}/tflm_llext)
   add_dependencies(app tflm)
   return()
diff --git a/src/audio/volume/CMakeLists.txt b/src/audio/volume/CMakeLists.txt
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: BSD-3-Clause
 
-if(CONFIG_COMP_VOLUME STREQUAL "m")
+if(CONFIG_COMP_VOLUME STREQUAL "m" AND DEFINED CONFIG_LLEXT)
   add_subdirectory(llext ${PROJECT_BINARY_DIR}/volume_llext)
   add_dependencies(app volume)
 else()
diff --git a/src/debug/tester/CMakeLists.txt b/src/debug/tester/CMakeLists.txt
@@ -9,7 +9,7 @@ set(base_files
 is_zephyr(zephyr)
 if(zephyr) ###  Zephyr ###
 
-  if(CONFIG_COMP_TESTER STREQUAL "m")
+  if(CONFIG_COMP_TESTER STREQUAL "m" AND DEFINED CONFIG_LLEXT)
 
     add_subdirectory(llext ${PROJECT_BINARY_DIR}/tester_llext)
     add_dependencies(app tester)
diff --git a/src/math/CMakeLists.txt b/src/math/CMakeLists.txt
@@ -43,7 +43,7 @@ if(CONFIG_BINARY_LOGARITHM_FIXED)
   list(APPEND base_files base2log.c)
 endif()
 
-if(CONFIG_MATH_FIR STREQUAL "m")
+if(CONFIG_MATH_FIR STREQUAL "m" AND DEFINED CONFIG_LLEXT)
   add_subdirectory(fir_llext ${PROJECT_BINARY_DIR}/aux1_fir_llext)
   add_dependencies(app aux1_fir)
 elseif(CONFIG_MATH_FIR)
@@ -54,7 +54,7 @@ if(CONFIG_MATH_FFT)
   add_subdirectory(fft)
 endif()
 
-if(CONFIG_MATH_IIR STREQUAL "m")
+if(CONFIG_MATH_IIR STREQUAL "m" AND DEFINED CONFIG_LLEXT)
   add_subdirectory(iir_llext ${PROJECT_BINARY_DIR}/aux1_iir_llext)
   add_dependencies(app aux1_iir)
 elseif(CONFIG_MATH_IIR)
diff --git a/src/probe/CMakeLists.txt b/src/probe/CMakeLists.txt
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: BSD-3-Clause
 
-if(CONFIG_PROBE STREQUAL "m")
+if(CONFIG_PROBE STREQUAL "m" AND DEFINED CONFIG_LLEXT)
   add_subdirectory(llext ${PROJECT_BINARY_DIR}/probe_llext)
   add_dependencies(app probe)
 elseif(CONFIG_PROBE)
diff --git a/src/samples/audio/CMakeLists.txt b/src/samples/audio/CMakeLists.txt
@@ -6,7 +6,7 @@ elseif(CONFIG_IPC_MAJOR_4)
   set(ipc_suffix ipc4)
 endif()
 
-if(CONFIG_SAMPLE_SMART_AMP STREQUAL "m")
+if(CONFIG_SAMPLE_SMART_AMP STREQUAL "m" AND DEFINED CONFIG_LLEXT)
   add_subdirectory(smart_amp_test_llext ${PROJECT_BINARY_DIR}/smart_amp_test_llext)
   add_dependencies(app smart_amp_test)
 elseif(CONFIG_SAMPLE_SMART_AMP)

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-if(CONFIG_COMP_DCBLOCK STREQUAL "m")`
	`1`	`+if(CONFIG_COMP_DCBLOCK STREQUAL "m" AND DEFINED CONFIG_LLEXT)`
`2`	`2`	`add_subdirectory(llext ${PROJECT_BINARY_DIR}/dcblock_llext)`
`3`	`3`	`add_dependencies(app dcblock)`
`4`	`4`	`return()`