From c97e32fed2a640648899a0aebabfd2f62a98e339 Mon Sep 17 00:00:00 2001 From: Dominic Martinez Date: Wed, 7 Sep 2022 10:42:17 -0400 Subject: [PATCH] build: fix bug in partition system Jamfiles MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Header files need to be included into a source file, not depended on. Using depends changes *.cpp from a source file to a generated file. Jam has a bug in dependency resolution that allows this to work, but this breaks in Ham. Change-Id: I584c719d353adbfdb68ddad5d05e7085f635ae28 Reviewed-on: https://review.haiku-os.org/c/haiku/+/5625 Tested-by: Commit checker robot Reviewed-by: waddlesplash Reviewed-by: Stephan Aßmus --- src/add-ons/kernel/partitioning_systems/gpt/Jamfile | 2 +- src/add-ons/kernel/partitioning_systems/intel/Jamfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/add-ons/kernel/partitioning_systems/gpt/Jamfile b/src/add-ons/kernel/partitioning_systems/gpt/Jamfile index 5bca71ec4c..703bcd07b0 100644 --- a/src/add-ons/kernel/partitioning_systems/gpt/Jamfile +++ b/src/add-ons/kernel/partitioning_systems/gpt/Jamfile @@ -16,7 +16,7 @@ DataFileToSourceFile [ FGristFiles MBR.h ] : [ FGristFiles mbr.bin ] : kMBR : kMBRSize ; if $(TARGET_ARCH) = "x86" || $(TARGET_ARCH) = "x86_64" { - Depends [ FGristFiles PartitionMapWriter.cpp ] : [ FGristFiles MBR.h ] ; + Includes [ FGristFiles PartitionMapWriter.cpp ] : [ FGristFiles MBR.h ] ; } KernelAddon efi_gpt : diff --git a/src/add-ons/kernel/partitioning_systems/intel/Jamfile b/src/add-ons/kernel/partitioning_systems/intel/Jamfile index cb32d99659..99d9cae78c 100644 --- a/src/add-ons/kernel/partitioning_systems/intel/Jamfile +++ b/src/add-ons/kernel/partitioning_systems/intel/Jamfile @@ -11,7 +11,7 @@ DataFileToSourceFile [ FGristFiles MBR.h ] : [ FGristFiles mbr.bin ] : kMBR : kMBRSize ; if $(TARGET_ARCH) = "x86" || $(TARGET_ARCH) = "x86_64" { - Depends [ FGristFiles PartitionMapWriter.cpp ] : [ FGristFiles MBR.h ] ; + Includes [ FGristFiles PartitionMapWriter.cpp ] : [ FGristFiles MBR.h ] ; } KernelAddon intel :