From 4319e24c4e4100f77bae028475544674868b6d09 Mon Sep 17 00:00:00 2001 From: Augustin Cavalier Date: Thu, 30 Sep 2021 18:32:16 -0400 Subject: [PATCH] Revert "Jamfiles: Repace TARGET_PACKAGING_ARCH with TARGET_KERNEL_ARCH in a few places." This reverts commit 66833143276573a3aa68600d3b38e56bc6e2aa7b. Apparently, on closer inspection, this is not actually correct: TARGET_KERNEL_ARCH is "x86" even on gcc2, and not an index into the TARGET_CC_* etc. variable sets. That is pretty confusing and should probably be fixed. --- src/add-ons/kernel/file_systems/bfs/JamCommon | 2 +- src/add-ons/kernel/file_systems/udf/drive_setup_addon/Jamfile | 2 +- src/system/kernel/lib/arch/x86/Jamfile | 2 +- src/system/kernel/lib/arch/x86_64/Jamfile | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/add-ons/kernel/file_systems/bfs/JamCommon b/src/add-ons/kernel/file_systems/bfs/JamCommon index 336411c5e7..a8ebbf5634 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 $(HAIKU_KERNEL_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..ba10d88682 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 $(HAIKU_KERNEL_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..bf7d1eefa7 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_$(HAIKU_KERNEL_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..1662f6f5db 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_$(HAIKU_KERNEL_ARCH)) system kernel arch $(TARGET_KERNEL_ARCH) ] ; SEARCH_SOURCE += [ FDirName $(SUBDIR) $(DOTDOT) generic ] ;