diff --git a/libcpu/risc-v/SConscript b/libcpu/risc-v/SConscript
index 14e06661d1..d8e80adfe2 100644
--- a/libcpu/risc-v/SConscript
+++ b/libcpu/risc-v/SConscript
@@ -16,7 +16,8 @@ if rtconfig.CPU in common64_arch :
 else :
     group += SConscript(os.path.join('common', 'SConscript'))
 
-if GetDepend('ARCH_CPU_64BIT'):
+# FIXME: remove implementation of plic in BSP
+if rtconfig.CPU in common64_arch:
     group += SConscript(os.path.join('plic', 'SConscript'))
 
 # cpu porting code files