[haiku-commits] haiku: hrev50957 - build/jam

  • From: kallisti5@xxxxxxxxxxx
  • To: haiku-commits@xxxxxxxxxxxxx
  • Date: Fri, 17 Feb 2017 20:16:01 +0100 (CET)

hrev50957 adds 2 changesets to branch 'master'
old head: 27b0f5295db2bc6f499ff94c0254c60a39dbf238
new head: deb1a319720243ba234ef3df770fffe436b67a6b
overview: 
http://cgit.haiku-os.org/haiku/log/?qt=range&q=deb1a3197202+%5E27b0f5295db2

----------------------------------------------------------------------------

2be19c58e938: build: Prevent recursive jam loops on host-only #13309
  
  * 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.

deb1a3197202: Revert "configure: Add host as valid build target in help."
  
  This hack is no longer needed.
  
  This reverts commit ea74aafd98c609b418c71a76689b143ddca5dc6c.

                          [ Alexander von Gluck IV <kallisti5@xxxxxxxxxxx> ]

----------------------------------------------------------------------------

2 files changed, 9 insertions(+), 1 deletion(-)
build/jam/BuildSetup | 8 ++++++++
configure            | 2 +-

############################################################################

Commit:      2be19c58e93862259020e6c9756f7fa7f2c08904
URL:         http://cgit.haiku-os.org/haiku/commit/?id=2be19c58e938
Author:      Alexander von Gluck IV <kallisti5@xxxxxxxxxxx>
Date:        Fri Feb 17 18:52:31 2017 UTC

Ticket:      https://dev.haiku-os.org/ticket/13309

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

* 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.

----------------------------------------------------------------------------

diff --git a/build/jam/BuildSetup b/build/jam/BuildSetup
index cdf1a3c..082a307 100644
--- a/build/jam/BuildSetup
+++ b/build/jam/BuildSetup
@@ -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
 # specified TARGET_PLATFORM. Some variables are package architecture dependent
 # and their name gets a respective suffix. A few variables exist both with and

############################################################################

Revision:    hrev50957
Commit:      deb1a319720243ba234ef3df770fffe436b67a6b
URL:         http://cgit.haiku-os.org/haiku/commit/?id=deb1a3197202
Author:      Alexander von Gluck IV <kallisti5@xxxxxxxxxxx>
Date:        Fri Feb 17 19:11:54 2017 UTC

Revert "configure: Add host as valid build target in help."

This hack is no longer needed.

This reverts commit ea74aafd98c609b418c71a76689b143ddca5dc6c.

----------------------------------------------------------------------------

diff --git a/configure b/configure
index 6d77c4c..539af84 100755
--- a/configure
+++ b/configure
@@ -74,7 +74,7 @@ options:
                               bootstrap and build Haiku from source only.
   --target=TARGET             Select build target platform.
                               [default=${TARGET_PLATFORM}]
-                              valid targets=r5,bone,dano,haiku,host
+                              valid targets=r5,bone,dano,haiku
   --target-arch <arch>        Haiku only: Specify the target architecture to
                               build for. Must be one of the architectures of 
the
                               host system. The installed build tools for that


Other related posts:

  • » [haiku-commits] haiku: hrev50957 - build/jam - kallisti5