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

Determine HAIKU_CPU and HAIKU_PACKAGING_ARCH in configure

Browse Source 
... instead of in BuildSetup.
This commit is contained in:
Ingo Weinhold
2013-07-20 01:01:21 +02:00
parent 21b3820e86
commit fc8967f1a6
2 changed files with 31 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/BuildSetup
-22
View File
@@ -202,18 +202,6 @@ switch $(HAIKU_DISTRO_COMPATIBILITY) {
$(HAIKU_DISTRO_COMPATIBILITY) ;
}
# analyze the gcc machine spec to determine HAIKU_CPU
switch $(HAIKU_GCC_MACHINE) {
case i?86-* : HAIKU_CPU = x86 ;
case x86_64-* : HAIKU_CPU = x86_64 ;
case powerpc-* : HAIKU_CPU = ppc ;
case m68k-* : HAIKU_CPU = m68k ;
case mipsel-* : HAIKU_CPU = mipsel ;
case arm-* : HAIKU_CPU = arm ;
case * : Exit "Unsupported gcc target machine:"
$(HAIKU_GCC_MACHINE) ;
}
# determine the endianness of the host
switch $(HOST_GCC_MACHINE) {
case amd64-* : HAIKU_HOST_IS_BIG_ENDIAN = 0 ;
@@ -236,7 +224,6 @@ switch $(HAIKU_CPU) {
HAIKU_BOOT_FLOPPY_IMAGE_SIZE = 1440 ; # in kB
# offset in floppy image (>= sizeof(haiku_loader))
HAIKU_BOOT_ARCHIVE_IMAGE_OFFSET = 192 ; # in kB - unused yet
HAIKU_PACKAGING_ARCH = ppc ;
}
case arm :
{
@@ -249,7 +236,6 @@ switch $(HAIKU_CPU) {
HAIKU_BOOT_ARCHIVE_IMAGE_OFFSET = 192 ; # in kB - unused yet
HAIKU_NO_WERROR = 1 ;
# we use #warning as placeholders for things to write...
HAIKU_PACKAGING_ARCH = arm ;
}
case x86 :
{
@@ -258,11 +244,6 @@ switch $(HAIKU_CPU) {
HAIKU_BOOT_FLOPPY_IMAGE_SIZE = 2880 ; # in kB
# offset in floppy image (>= sizeof(haiku_loader))
HAIKU_BOOT_ARCHIVE_IMAGE_OFFSET = 300 ; # in kB
if $(HAIKU_GCC_VERSION[1]) = 2 {
HAIKU_PACKAGING_ARCH = x86_gcc2 ;
} else {
HAIKU_PACKAGING_ARCH = x86 ;
}
# yasm is required for target arch x86
if ! $(HAIKU_YASM) {
@@ -276,7 +257,6 @@ switch $(HAIKU_CPU) {
HAIKU_BOOT_FLOPPY_IMAGE_SIZE = 2880 ; # in kB
# offset in floppy image (>= sizeof(haiku_loader))
HAIKU_BOOT_ARCHIVE_IMAGE_OFFSET = 300 ; # in kB
HAIKU_PACKAGING_ARCH = x86_64 ;
# x86_64 kernel source is under arch/x86.
HAIKU_KERNEL_ARCH = x86 ;
@@ -305,7 +285,6 @@ switch $(HAIKU_CPU) {
HAIKU_BOOT_ARCHIVE_IMAGE_OFFSET = 260 ; # in kB
HAIKU_NO_WERROR = 1 ;
# we use #warning as placeholders for things to write...
HAIKU_PACKAGING_ARCH = m68k ;
}
case mipsel :
{
@@ -316,7 +295,6 @@ switch $(HAIKU_CPU) {
HAIKU_BOOT_ARCHIVE_IMAGE_OFFSET = 192 ; # in kB
HAIKU_NO_WERROR = 1 ;
# we use #warning as placeholders for things to write...
HAIKU_PACKAGING_ARCH = mipsel ;
}
case * :
Exit "Currently unsupported target CPU:" $(HAIKU_CPU) ;