diff --git a/gcc/gcc/config/riscv/t-haiku b/gcc/gcc/config/riscv/t-haiku
index 216d2776a1..6cccc72ae0 100644
--- a/gcc/gcc/config/riscv/t-haiku
+++ b/gcc/gcc/config/riscv/t-haiku
@@ -1,3 +1,4 @@
-# Only XLEN and ABI affect Linux multilib dir names, e.g. /lib32/ilp32d/
-MULTILIB_DIRNAMES := $(patsubst rv32%,lib32,$(patsubst rv64%,lib64,$(MULTILIB_DIRNAMES)))
-MULTILIB_OSDIRNAMES := $(patsubst lib%,../lib%,$(MULTILIB_DIRNAMES))
+# Disable for now, only RV64 on Haiku for the moment
+# Only XLEN and ABI affect multilib dir names, e.g. /lib32/ilp32d/
+#MULTILIB_DIRNAMES := $(patsubst rv32%,lib32,$(patsubst rv64%,lib64,$(MULTILIB_DIRNAMES)))
+#MULTILIB_OSDIRNAMES := $(patsubst lib%,../lib%,$(MULTILIB_DIRNAMES))