* configure: Pass gcc's host machine string to the jam build system.
* BuildSetup: Set jam variable HOST_PLATFORM_IS_64_BIT and add host define HAIKU_HOST_PLATFORM_64_BIT if the host platform is 64 bit. Removed the check from BeOSBuildCompatibility.h. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@34211 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
+12
-1
@@ -478,9 +478,15 @@ HAIKU_BUILD_DESCRIPTION ?= "Unknown Build" ;
|
||||
|
||||
# host platform settings
|
||||
|
||||
# enable GCC -m32 option, if requested
|
||||
# analyze the host gcc machine spec to find out about 64-bitness
|
||||
HOST_PLATFORM_IS_64_BIT = ;
|
||||
if $(HAIKU_HOST_USE_32BIT) = 1 {
|
||||
# enable GCC -m32 option
|
||||
HOST_GCC_BASE_FLAGS = -m32 ;
|
||||
} else {
|
||||
switch $(HOST_GCC_MACHINE) {
|
||||
case x86_64-* : HOST_PLATFORM_IS_64_BIT = 1 ;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -531,6 +537,7 @@ HOST_CPU ?= $(OSPLAT:L) ;
|
||||
HOST_ARCH ?= $(HOST_CPU) ;
|
||||
HOST_ARCH_MACRO_DEFINE = ARCH_$(HOST_CPU) ;
|
||||
|
||||
|
||||
# directories
|
||||
HOST_OBJECT_BASE_DIR = [ FDirName $(HAIKU_OBJECT_DIR) $(HOST_PLATFORM) ] ;
|
||||
HOST_COMMON_ARCH_OBJECT_DIR = [ FDirName $(HOST_OBJECT_BASE_DIR) common ] ;
|
||||
@@ -926,6 +933,10 @@ switch $(HOST_PLATFORM) {
|
||||
case sunos : HOST_DEFINES += HAIKU_HOST_PLATFORM_SUNOS ;
|
||||
}
|
||||
|
||||
# define host platform 64 bit macro
|
||||
if $(HOST_PLATFORM_IS_64_BIT) {
|
||||
HOST_DEFINES += HAIKU_HOST_PLATFORM_64_BIT ;
|
||||
}
|
||||
|
||||
#pragma mark -
|
||||
|
||||
|
||||
Reference in New Issue
Block a user