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

Compile generic_x86 CPU module for x86_64.

Browse Source
This commit is contained in:
Alex Smith
2012-07-21 08:32:07 +01:00
parent 82694bd124
commit 4451c47c64
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/FloppyBootImage
+5 -3
View File
@@ -3,7 +3,7 @@
local X86_ONLY = ; local X86_ONLY = ;
local PPC_ONLY = ; local PPC_ONLY = ;
if $(TARGET_ARCH) = x86 { if $(TARGET_ARCH) = x86 || $(TARGET_ARCH) = x86_64 {
X86_ONLY = "" ; X86_ONLY = "" ;
} else if $(TARGET_ARCH) = ppc { } else if $(TARGET_ARCH) = ppc {
X86_ONLY = ; X86_ONLY = ;
@@ -64,6 +64,8 @@ if $(TARGET_ARCH) = x86_64 {
AddFilesToFloppyBootArchive system add-ons kernel partitioning_systems AddFilesToFloppyBootArchive system add-ons kernel partitioning_systems
: intel session ; : intel session ;
AddFilesToFloppyBootArchive system add-ons kernel cpu : generic_x86 ;
AddNewDriversToFloppyBootArchive disk scsi : scsi_cd scsi_disk ; AddNewDriversToFloppyBootArchive disk scsi : scsi_cd scsi_disk ;
} else { } else {
# modules # modules
@@ -97,7 +99,7 @@ if $(TARGET_ARCH) = x86_64 {
: <usb>uhci <usb>ohci <usb>ehci ; : <usb>uhci <usb>ohci <usb>ehci ;
} }
if $(TARGET_ARCH) = x86 { if $(TARGET_ARCH) = x86 || $(TARGET_ARCH) = x86_64 {
AddFilesToFloppyBootArchive system add-ons kernel cpu : generic_x86 ; AddFilesToFloppyBootArchive system add-ons kernel cpu : generic_x86 ;
} }
@@ -146,7 +148,7 @@ if $(NET_BOOT) = 1 {
if $(TARGET_ARCH) = x86_64 { if $(TARGET_ARCH) = x86_64 {
AddBootModuleSymlinksToFloppyBootArchive AddBootModuleSymlinksToFloppyBootArchive
ata dpc config_manager pci scsi ata_adapter locked_pool scsi_periph ata dpc config_manager pci scsi ata_adapter locked_pool scsi_periph
generic_ide_pci scsi_cd scsi_disk intel session iso9660 generic_x86 generic_ide_pci scsi_cd scsi_disk intel session iso9660
attribute_overlay write_overlay attribute_overlay write_overlay
; ;
} else { } else {
src/add-ons/kernel/cpu/Jamfile
+1 -1
View File
@@ -1,3 +1,3 @@
SubDir HAIKU_TOP src add-ons kernel cpu ; SubDir HAIKU_TOP src add-ons kernel cpu ;
SubInclude HAIKU_TOP src add-ons kernel cpu $(TARGET_ARCH) ; SubInclude HAIKU_TOP src add-ons kernel cpu $(TARGET_KERNEL_ARCH) ;