diff --git a/build/jam/BuildSetup b/build/jam/BuildSetup
index 30dc85abfe..a03fec254e 100644
--- a/build/jam/BuildSetup
+++ b/build/jam/BuildSetup
@@ -340,6 +340,7 @@ HAIKU_BOOT_CCFLAGS += -finline -fno-builtin ;
 HAIKU_BOOT_C++FLAGS += -finline -fno-builtin -fno-exceptions ;
 
 if $(HAIKU_GCC_VERSION[1]) >= 3 {
+	HAIKU_BOOT_C++FLAGS += -fno-use-cxa-atexit ;
 	HAIKU_KERNEL_C++FLAGS += -fno-use-cxa-atexit ;
 }