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

jam/build: Solve infinite recursion on host-only tools; fixes #17546

Browse Source 
* We should likely check for Jamfile recursion in jam instead of
  segfaulting

Change-Id: I19ed771b0e943504e11bd6182adc81a0ea2668e8
This commit is contained in:
Alexander von Gluck IV 2022-01-23 16:40:09 -06:00
parent cc69b20bb1
commit 526c9fcfb4
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/jam/BuildSetup
View File

@ -555,8 +555,10 @@ SetPlatformCompatibilityFlagVariables TARGET_PLATFORM : TARGET : target ;
# Haiku architecture is undefined on host-only builds # Haiku architecture is undefined on host-only builds
# set here to host arch to prevent recusive loops. # set here to host arch to prevent recusive loops.
if $(HAIKU_HOST_BUILD_ONLY) = 1 { if $(HAIKU_HOST_BUILD_ONLY) = 1 {
Echo "Host tools build for $(HOST_ARCH)" ;
HAIKU_ARCH = $(HOST_ARCH) ; HAIKU_ARCH = $(HOST_ARCH) ;
HAIKU_KERNEL_ARCH = $(HOST_ARCH) ; HAIKU_KERNEL_ARCH = $(HOST_ARCH) ;
HAIKU_KERNEL_ARCH_DIR = $(HAIKU_KERNEL_ARCH) ;
} }
# Set TARGET_* variables either from HAIKU_* or HOST_* depending on the # Set TARGET_* variables either from HAIKU_* or HOST_* depending on the