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: Silly build fix
2026-02-04 07:53:14 +01:00 · 2025-01-01 09:19:56 +00:00 · 2024-12-27 17:00:48 -06:00 · 2024-12-27 14:15:24 +00:00 · 2024-07-21 10:00:58 +02:00
3 changed files with 12 additions and 5 deletions
--- a/gcc/libgcc/config.host
+++ b/gcc/libgcc/config.host
@@ -1221,7 +1221,7 @@ powerpc*-*-freebsd*)
 	esac
 	;;
 powerpc-*-haiku*)
-	tmake_file="$tmake_file rs6000/t-ppccomm rs6000/t-savresfpgr rs6000/t-crtstuff rs6000/t-crtstuff-pic t-fdpbit"
+	tmake_file="$tmake_file rs6000/t-ppccomm rs6000/t-savresfgpr rs6000/t-crtstuff rs6000/t-crtstuff-pic t-fdpbit"
 	;;
 powerpc-*-netbsd*)
 	tmake_file="$tmake_file rs6000/t-netbsd rs6000/t-crtstuff"
--- 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)
--- a/jam/jam.h
+++ b/jam/jam.h
@@ -429,7 +429,8 @@
 # endif
 # endif 

-# ifdef __sparc__
+# if defined( __sparc__ ) || \
+     defined( __sparc64__)
 # if !defined( OS_SUNOS )
 # define OSPLAT "OSPLAT=SPARC"
 # endif
@@ -441,7 +442,8 @@
 # endif
 # endif

-# ifdef __arm__
+# if defined( __arm__ ) || \
+     defined(__aarch64__)
 # define OSPLAT "OSPLAT=ARM"
 # endif

@@ -455,6 +457,10 @@
 # define OSPLAT "OSPLAT=390"
 # endif

+# ifdef __riscv
+# define OSPLAT "OSPLAT=RISCV"
+# endif
+
 # ifndef OSPLAT
 # define OSPLAT ""
 # endif
Author	SHA1	Message	Date
Jessica Hamilton	360fe2fd07	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.	2025-01-01 09:19:56 +00:00
Alexander von Gluck	58add95cfc	jam: Silly build fix	2024-12-27 17:00:48 -06:00
Alexander von Gluck	400880c468	jam: Fill in missing OSPLAT architectures * These are horrible, but at least consistent and won't break existing jam definitions. * Haiku's jam goes through and adjusts x86 to x86_64, etc.. so do the same for other 32 vs 64-bit architectures. Change-Id: I8b0eee20dd35e7458ef31949cd3fa621265c2f51 Reviewed-on: https://review.haiku-os.org/c/buildtools/+/8719 Reviewed-by: Adrien Destugues <pulkomandy@pulkomandy.tk> Reviewed-by: X512 X512 <danger_mail@list.ru> Reviewed-by: Alexander von Gluck <alex@terarocket.io>	2024-12-27 14:15:24 +00:00
PulkoMandy	d86b03dc2b	Fix typo from btrev43210 This results in some functions being missing from libgcc, and then undefined references during Haiku build.	2024-07-21 10:00:58 +02:00