From 360fe2fd07462b3eaefd54a4c3075d6e2c2e8993 Mon Sep 17 00:00:00 2001 From: Jessica Hamilton Date: Wed, 1 Jan 2025 09:19:56 +0000 Subject: [PATCH] jam: mirror Jamfile in Makefile. Without these changes, `jam0` is different to `bin.*/jam`, a subtle difference that was triggering errors in CI due to use of `jam0`. In particular, the omission of `OPT_JAM_TARGETS_VARIABLE_EXT` results in a `jam0` that cannot build Haiku, as `$(JAM_TARGETS)` will not be defined, and is required by Haiku's build system. --- jam/Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/jam/Makefile b/jam/Makefile index d287a84ba3..a28b36f647 100644 --- a/jam/Makefile +++ b/jam/Makefile @@ -1,7 +1,7 @@ # Makefile for jam CC = cc -CFLAGS = -O +CFLAGS = -O -DOPT_HEADER_CACHE_EXT -DOPT_JAMFILE_CACHE_EXT -DOPT_JAM_TARGETS_VARIABLE_EXT EXENAME = ./jam0 TARGET = -o $(EXENAME) HOST_SYSTEM=$(shell uname) @@ -64,7 +64,8 @@ SOURCES = \ filent.c fileos2.c fileunix.c filevms.c glob.c hash.c \ headers.c jam.c jambase.c jamgram.c lists.c make.c make1.c \ newstr.c option.c parse.c pathunix.c pathvms.c regexp.c \ - rules.c scan.c search.c timestamp.c variable.c + rules.c scan.c search.c timestamp.c variable.c \ + jcache.c hcache.c all: $(EXENAME) LINKLIBS=$(LINKLIBS) $(EXENAME)