diff --git a/src/add-ons/kernel/file_systems/bfs/JamCommon b/src/add-ons/kernel/file_systems/bfs/JamCommon
index 336411c5e7..b2656e59e6 100644
--- a/src/add-ons/kernel/file_systems/bfs/JamCommon
+++ b/src/add-ons/kernel/file_systems/bfs/JamCommon
@@ -12,7 +12,7 @@
 		SubDirHdrs $(HAIKU_TOP) src add-ons kernel file_systems bfs ;
 	}
 
-	if $(TARGET_KERNEL_ARCH) = x86_gcc2 {
+	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 03a9734c63..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,7 +13,7 @@ oldOPTIM = $(OPTIM) ;
 		defines += COMPILE_FOR_R5 ;
 	}
 
-	if $(TARGET_KERNEL_ARCH) = x86_gcc2 {
+	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/system/kernel/lib/arch/x86/Jamfile b/src/system/kernel/lib/arch/x86/Jamfile
index 0e6e1a2619..73678ad806 100644
--- a/src/system/kernel/lib/arch/x86/Jamfile
+++ b/src/system/kernel/lib/arch/x86/Jamfile
@@ -1,7 +1,7 @@
 SubDir HAIKU_TOP src system kernel lib arch x86 ;
 
 # find the generated asm_offsets.h
-SubDirHdrs [ FDirName $(TARGET_COMMON_DEBUG_OBJECT_DIR_$(TARGET_KERNEL_ARCH))
+SubDirHdrs [ FDirName $(TARGET_COMMON_DEBUG_OBJECT_DIR_$(TARGET_PACKAGING_ARCH))
 	system kernel arch $(TARGET_ARCH) ] ;
 
 SEARCH_SOURCE += [ FDirName $(SUBDIR) $(DOTDOT) generic ] ;
diff --git a/src/system/kernel/lib/arch/x86_64/Jamfile b/src/system/kernel/lib/arch/x86_64/Jamfile
index 24c29552bf..67a3890ac0 100644
--- a/src/system/kernel/lib/arch/x86_64/Jamfile
+++ b/src/system/kernel/lib/arch/x86_64/Jamfile
@@ -1,7 +1,7 @@
 SubDir HAIKU_TOP src system kernel lib arch x86_64 ;
 
 # find the generated asm_offsets.h
-SubDirHdrs [ FDirName $(TARGET_COMMON_DEBUG_OBJECT_DIR_$(TARGET_KERNEL_ARCH))
+SubDirHdrs [ FDirName $(TARGET_COMMON_DEBUG_OBJECT_DIR_$(TARGET_PACKAGING_ARCH))
 	system kernel arch $(TARGET_KERNEL_ARCH) ] ;
 
 SEARCH_SOURCE += [ FDirName $(SUBDIR) $(DOTDOT) generic ] ;