Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Jamfiles: Repace TARGET_PACKAGING_ARCH with TARGET_KERNEL_ARCH in a few places."

Browse Source 
Previous revert inadvertently staged a different version. That's what I get for
rebasing 3 things at one time...

This reverts commit 6683314327.
This commit is contained in:
Augustin Cavalier 2021-09-30 18:43:32 -04:00
parent 24e15920a2
commit e87395438a
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/add-ons/kernel/file_systems/bfs/JamCommon
View File

@ -12,7 +12,7 @@
SubDirHdrs $(HAIKU_TOP) src add-ons kernel file_systems bfs ;
}
if $(HAIKU_KERNEL_ARCH) = x86_gcc2 {
if $(TARGET_KERNEL_ARCH) = x86_gcc2 {
# GCC2 doesn't compile BFS correctly with -O2 or more
OPTIM = -O1 ;
}

2
src/add-ons/kernel/file_systems/udf/drive_setup_addon/Jamfile
View File

@ -13,7 +13,7 @@ oldOPTIM = $(OPTIM) ;
defines += COMPILE_FOR_R5 ;
}
if $(HAIKU_KERNEL_ARCH) = x86_gcc2 {
if $(TARGET_KERNEL_ARCH) = x86_gcc2 {
# the gcc on BeOS doesn't compile BFS correctly with -O2 or more
OPTIM = -O1 ;
}

2
src/system/kernel/lib/arch/x86/Jamfile
View File

@ -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_$(HAIKU_KERNEL_ARCH))
SubDirHdrs [ FDirName $(TARGET_COMMON_DEBUG_OBJECT_DIR_$(TARGET_KERNEL_ARCH))
system kernel arch $(TARGET_ARCH) ] ;
SEARCH_SOURCE += [ FDirName $(SUBDIR) $(DOTDOT) generic ] ;

2
src/system/kernel/lib/arch/x86_64/Jamfile
View File

@ -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_$(HAIKU_KERNEL_ARCH))
SubDirHdrs [ FDirName $(TARGET_COMMON_DEBUG_OBJECT_DIR_$(TARGET_KERNEL_ARCH))
system kernel arch $(TARGET_KERNEL_ARCH) ] ;
SEARCH_SOURCE += [ FDirName $(SUBDIR) $(DOTDOT) generic ] ;