i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

build: Prevent recursive jam loops on host-only #13309

Browse Source 
* When --host-only is used, HAIKU_*ARCH is undefined.
* Various architecture variables are undefined resulting
  in architecture dependant code paths getting called
  recursively.
  (blah/Jamfile loads blah//Jamfile vs blah/x86/Jamfile)
* Another option is setting HAIKU_*ARCH to the host arch
  if undefined, but that might have unintended impacts.
This commit is contained in:
Alexander von Gluck IV
2017-02-17 13:01:31 -06:00
parent 27b0f5295d
commit 2be19c58e9
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/BuildSetup
+8
View File
@@ -640,6 +640,14 @@ if $(TARGET_PLATFORM) != haiku {
} }
} }
# Haiku architecture is undefined on host-only builds
# set here to host arch to prevent recusive loops.
if $(HAIKU_HOST_BUILD_ONLY) = 1 {
HAIKU_ARCH = $(HOST_ARCH) ;
HAIKU_KERNEL_ARCH = $(HOST_ARCH) ;
}
# Set TARGET_* variables either from HAIKU_* or HOST_* depending on the # Set TARGET_* variables either from HAIKU_* or HOST_* depending on the
# specified TARGET_PLATFORM. Some variables are package architecture dependent # specified TARGET_PLATFORM. Some variables are package architecture dependent
# and their name gets a respective suffix. A few variables exist both with and # and their name gets a respective suffix. A few variables exist both with and