diff --git a/src/add-ons/kernel/file_systems/bfs/JamCommon b/src/add-ons/kernel/file_systems/bfs/JamCommon
index 78b4d83b1d..b0cc99de3f 100644
--- a/src/add-ons/kernel/file_systems/bfs/JamCommon
+++ b/src/add-ons/kernel/file_systems/bfs/JamCommon
@@ -12,8 +12,8 @@
 		SubDirHdrs $(HAIKU_TOP) src add-ons kernel file_systems bfs ;
 	}
 
-	if $(DEBUG) = 0 {
-		# the gcc on BeOS doesn't compile BFS correctly with -O2 or more
+	if $(TARGET_PACKAGING_ARCH) = x86_gcc2 {
+		# GCC2 doesn't compile BFS correctly with -O2 or more
 		OPTIM = -O1 ;
 	}
 
diff --git a/src/add-ons/kernel/file_systems/udf/drive_setup_addon/Jamfile b/src/add-ons/kernel/file_systems/udf/drive_setup_addon/Jamfile
index 329a3ab981..23e546dcee 100644
--- a/src/add-ons/kernel/file_systems/udf/drive_setup_addon/Jamfile
+++ b/src/add-ons/kernel/file_systems/udf/drive_setup_addon/Jamfile
@@ -13,9 +13,7 @@ oldOPTIM = $(OPTIM) ;
 		defines += COMPILE_FOR_R5 ;
 	}
 
-	if $(DEBUG) {
-		#defines += DEBUG ;
-	} else {
+	if $(TARGET_PACKAGING_ARCH) = x86_gcc2 {
 		# the gcc on BeOS doesn't compile BFS correctly with -O2 or more
 		OPTIM = -O1 ;
 	}
diff --git a/src/tests/add-ons/kernel/file_systems/iso9660/iso9660_shell/Jamfile b/src/tests/add-ons/kernel/file_systems/iso9660/iso9660_shell/Jamfile
index a2e8a14973..16ed05e809 100644
--- a/src/tests/add-ons/kernel/file_systems/iso9660/iso9660_shell/Jamfile
+++ b/src/tests/add-ons/kernel/file_systems/iso9660/iso9660_shell/Jamfile
@@ -12,8 +12,8 @@ DEFINES += HAIKU_BUILD_COMPATIBILITY_H ;
 		FS_SHELL
 		;
 
-	if $(DEBUG) = 0 {
-		# the gcc on BeOS doesn't compile BFS correctly with -O2 or more
+	if $(TARGET_PACKAGING_ARCH) = x86_gcc2 {
+		# GCC2 doesn't compile BFS correctly with -O2 or more
 		OPTIM = -O1 ;
 	}
 
diff --git a/src/tests/add-ons/kernel/file_systems/udf/udf_shell/Jamfile b/src/tests/add-ons/kernel/file_systems/udf/udf_shell/Jamfile
index 017264b7cb..53edbd46f8 100644
--- a/src/tests/add-ons/kernel/file_systems/udf/udf_shell/Jamfile
+++ b/src/tests/add-ons/kernel/file_systems/udf/udf_shell/Jamfile
@@ -11,8 +11,8 @@ DEFINES += HAIKU_BUILD_COMPATIBILITY_H ;
 		FS_SHELL
 		;
 
-	if $(DEBUG) = 0 {
-		# the gcc on BeOS doesn't compile BFS correctly with -O2 or more
+	if $(TARGET_PACKAGING_ARCH) = x86_gcc2 {
+		# GCC2 doesn't compile BFS correctly with -O2 or more
 		OPTIM = -O1 ;
 	}
 
diff --git a/src/tests/add-ons/kernel/file_systems/userlandfs/bfs/Jamfile b/src/tests/add-ons/kernel/file_systems/userlandfs/bfs/Jamfile
index b42a2d0349..a63b15cec4 100644
--- a/src/tests/add-ons/kernel/file_systems/userlandfs/bfs/Jamfile
+++ b/src/tests/add-ons/kernel/file_systems/userlandfs/bfs/Jamfile
@@ -11,8 +11,8 @@ SEARCH_SOURCE += $(bfsTop) ;
 		USER=1
 	;
 
-	if $(DEBUG) = 0 {
-		# the gcc on BeOS doesn't compile BFS correctly with -O2 or more
+	if $(TARGET_PACKAGING_ARCH) = x86_gcc2 {
+		# GCC2 doesn't compile BFS correctly with -O2 or more
 		OPTIM = -O1 ;
 	}
 
diff --git a/src/tools/bfs_shell/Jamfile b/src/tools/bfs_shell/Jamfile
index 67cb11ed32..0fa6788d95 100644
--- a/src/tools/bfs_shell/Jamfile
+++ b/src/tools/bfs_shell/Jamfile
@@ -12,8 +12,8 @@ DEFINES += HAIKU_BUILD_COMPATIBILITY_H ;
 		FS_SHELL
 		;
 
-	if $(DEBUG) = 0 {
-		# the gcc on BeOS doesn't compile BFS correctly with -O2 or more
+	if $(TARGET_PACKAGING_ARCH) = x86_gcc2 {
+		# GCC2 doesn't compile BFS correctly with -O2 or more
 		OPTIM = -O1 ;
 	}