[haiku-commits] Re: haiku: hrev49240 - src/add-ons/kernel/partitioning_systems/intel

  • From: Jérôme Duval <jerome.duval@xxxxxxxxx>
  • To: haiku-commits@xxxxxxxxxxxxx
  • Date: Thu, 4 Jun 2015 11:43:12 +0200

Am 04.06.2015 8:36 vorm. schrieb <jessica.l.hamilton@xxxxxxxxx>:


hrev49240 adds 1 changeset to branch 'master'
old head: e460be6cbdd7f54cb7c79f30d199d70fd7e468c3
new head: d8ba3b09900a13dd91df9536eca8caf68200591a
overview:
http://cgit.haiku-os.org/haiku/log/?qt=range&q=d8ba3b09900a+%5Ee460be6cbdd7


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

d8ba3b09900a: intel partitioning system: fix build for non-x86 systems

* There is no need for the Intel partitioning system to write MBR
bootcode on non-x86 systems
* The MBR_HEADER define is used to prevent Jam from making MBR.h
a dependency; the dependency is then specified explicitly when
building for x86/x86_64 platforms

[ Jessica Hamilton <jessica.l.hamilton@xxxxxxxxx>
]


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

Revision: hrev49240
Commit: d8ba3b09900a13dd91df9536eca8caf68200591a
URL: http://cgit.haiku-os.org/haiku/commit/?id=d8ba3b09900a
Author: Jessica Hamilton <jessica.l.hamilton@xxxxxxxxx>
Date: Thu Jun 4 06:30:55 2015 UTC


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

2 files changed, 10 insertions(+), 1 deletion(-)
src/add-ons/kernel/partitioning_systems/intel/Jamfile | 4 ++++
.../kernel/partitioning_systems/intel/PartitionMapWriter.cpp | 7 ++++++-


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

diff --git a/src/add-ons/kernel/partitioning_systems/intel/Jamfile
b/src/add-ons/kernel/partitioning_systems/intel/Jamfile
index b4fe1d5..6478221 100644
--- a/src/add-ons/kernel/partitioning_systems/intel/Jamfile
+++ b/src/add-ons/kernel/partitioning_systems/intel/Jamfile
@@ -10,6 +10,10 @@ BuildMBR [ FGristFiles mbr.bin ] : mbr.S ;
DataFileToSourceFile [ FGristFiles MBR.h ] : [ FGristFiles mbr.bin ]
: kMBR : kMBRSize ;

+if $(HAIKU_ARCH) = "x86" || $(HAIKU_ARCH) = "x86"64 {

It should be x86_64.

Bye,
Jérôme

Other related posts:

  1. Home
  2. haiku-commits
  3. Archive
  4. 06-2015