mirror of
https://review.haiku-os.org/buildtools
synced 2026-02-04 07:53:14 +01:00
Compare commits
7 Commits
btrev43175
...
btrev43181
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
9e6821c209 | ||
|
|
72c791bc1f | ||
|
|
4b7b6c63e8 | ||
|
|
0ff4d6adaf | ||
|
|
139f4e7c6c | ||
|
|
bc70af2399 | ||
|
|
c3d8487752 |
@@ -203,7 +203,7 @@ arm*-*-conix*) targ_emul=armelf
|
||||
arm*-*-fuchsia*) targ_emul=armelf_fuchsia
|
||||
targ_extra_emuls="armelfb_fuchsia armelf armelfb"
|
||||
;;
|
||||
arm*-*-haiku*) arg_emul=armelf_haiku
|
||||
arm*-*-haiku*) targ_emul=armelf_haiku
|
||||
targ_extra_emuls=armelf
|
||||
;;
|
||||
avr-*-*) targ_emul=avr2
|
||||
|
||||
@@ -994,6 +994,7 @@ aarch64*-*-freebsd*)
|
||||
tmake_file="${tmake_file} aarch64/t-aarch64 aarch64/t-aarch64-freebsd"
|
||||
;;
|
||||
aarch64*-*-haiku*)
|
||||
gcc_cv_initfini_array=yes
|
||||
tm_file="${tm_file} dbxelf.h elfos.h haiku.h haiku-stdint.h"
|
||||
tm_file="${tm_file} aarch64/aarch64-elf.h aarch64/aarch64-haiku.h"
|
||||
tmake_file="${tmake_file} t-haiku aarch64/t-aarch64 aarch64/t-aarch64-haiku"
|
||||
@@ -2104,6 +2105,7 @@ microblaze*-*-elf)
|
||||
tmake_file="${tmake_file} microblaze/t-microblaze"
|
||||
;;
|
||||
riscv*-*-haiku*)
|
||||
gcc_cv_initfini_array=yes
|
||||
tm_file="elfos.h haiku.h ${tm_file} riscv/haiku.h haiku-stdint.h"
|
||||
tmake_file="${tmake_file} t-haiku riscv/t-riscv riscv/t-haiku"
|
||||
gnu_ld=yes
|
||||
|
||||
14
jam/Jambase
14
jam/Jambase
@@ -135,7 +135,7 @@
|
||||
|
||||
# for perforce use -- jambase version
|
||||
|
||||
JAMBASEDATE = 2020.09.16 ;
|
||||
JAMBASEDATE = 2021.10.20 ;
|
||||
|
||||
# Initialize variables
|
||||
#
|
||||
@@ -248,7 +248,7 @@ if $(NT) {
|
||||
YACCFILES ?= y.tab ;
|
||||
YACCFLAGS ?= -d ;
|
||||
} else if $(OS) = HAIKU {
|
||||
BINDIR ?= /boot/common/bin ;
|
||||
BINDIR ?= /boot/system/non-packaged/bin ;
|
||||
CC ?= gcc ;
|
||||
C++ ?= $(CC) ;
|
||||
CHMOD ?= chmod ;
|
||||
@@ -256,11 +256,11 @@ if $(NT) {
|
||||
CHOWN ?= chown ;
|
||||
FORTRAN ?= "" ;
|
||||
LEX ?= flex ;
|
||||
LIBDIR ?= /boot/common/lib ;
|
||||
LIBDIR ?= /boot/system/non-packaged/lib ;
|
||||
LINK ?= gcc ;
|
||||
MANDIR ?= /boot/common/man ;
|
||||
MANDIR ?= /boot/system/non-packaged/documentation/man ;
|
||||
RANLIB ?= ranlib ;
|
||||
STDHDRS ?= /boot/develop/headers/posix ;
|
||||
STDHDRS ?= /boot/system/develop/headers/posix ;
|
||||
YACC ?= bison -y ;
|
||||
YACCGEN ?= .c ;
|
||||
YACCFILES ?= y.tab ;
|
||||
@@ -272,7 +272,7 @@ if $(NT) {
|
||||
CC ?= gcc ;
|
||||
CCFLAGS += -D__cygwin__ ;
|
||||
LEX ?= flex ;
|
||||
JAMSHELL ?= sh -c ;
|
||||
JAMSHELL ?= sh -e -c ;
|
||||
RANLIB ?= "" ;
|
||||
SUFEXE ?= .exe ;
|
||||
YACC ?= bison -y ;
|
||||
@@ -316,7 +316,7 @@ if $(NT) {
|
||||
#
|
||||
|
||||
AR ?= ar ;
|
||||
ARFLAGS ?= ru ;
|
||||
ARFLAGS ?= r ;
|
||||
AS ?= as ;
|
||||
ASFLAGS ?= ;
|
||||
AWK ?= awk ;
|
||||
|
||||
@@ -58,7 +58,7 @@
|
||||
# define STRUCT_DIRENT struct dirent
|
||||
# endif
|
||||
|
||||
# ifdef __CYGWIN__
|
||||
# if defined(__CYGWIN__) || defined(unix)
|
||||
# include <unistd.h>
|
||||
# endif
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
/* Generated by mkjambase from Jambase */
|
||||
const char *jambase[] = {
|
||||
/* Jambase */
|
||||
"JAMBASEDATE = 2018.11.21 ;\n",
|
||||
"JAMBASEDATE = 2021.10.20 ;\n",
|
||||
"if $(NT) {\n",
|
||||
"MV ?= move /y ;\n",
|
||||
"CP ?= copy ;\n",
|
||||
@@ -12,7 +12,8 @@ const char *jambase[] = {
|
||||
"SUFOBJ ?= .obj ;\n",
|
||||
"SUFEXE ?= .exe ;\n",
|
||||
"if $(MSVC) {\n",
|
||||
"AR ?= lib /nologo ;\n",
|
||||
"AR ?= lib ;\n",
|
||||
"ARFLAGS ?= /nologo ;\n",
|
||||
"CC ?= cl /nologo ;\n",
|
||||
"CCFLAGS ?= /D \\\"WIN\\\" ;\n",
|
||||
"C++ ?= $(CC) ;\n",
|
||||
@@ -31,6 +32,7 @@ const char *jambase[] = {
|
||||
"MSVCNT ?= $(MSVCDIR) ;\n",
|
||||
"local I ; if $(OSPLAT) = IA64 { I = ia64\\\\ ; } else { I = \"\" ; }\n",
|
||||
"AR ?= lib ;\n",
|
||||
"ARFLAGS ?= ;\n",
|
||||
"AS ?= masm386 ;\n",
|
||||
"CC ?= cl /nologo ;\n",
|
||||
"CCFLAGS ?= \"\" ;\n",
|
||||
@@ -56,7 +58,8 @@ const char *jambase[] = {
|
||||
"RANLIB ?= \"ranlib\" ;\n",
|
||||
"SUFEXE ?= .exe ;\n",
|
||||
"} else if $(OS) = BEOS && $(OSPLAT) = PPC {\n",
|
||||
"AR ?= mwld -xml -o ;\n",
|
||||
"AR ?= mwld ;\n",
|
||||
"ARFLAGS ?= -xml -o ;\n",
|
||||
"BINDIR ?= /boot/home/config/bin ;\n",
|
||||
"CC ?= mwcc ;\n",
|
||||
"CCFLAGS ?= -nosyspath ;\n",
|
||||
@@ -96,7 +99,7 @@ const char *jambase[] = {
|
||||
"YACCFILES ?= y.tab ;\n",
|
||||
"YACCFLAGS ?= -d ;\n",
|
||||
"} else if $(OS) = HAIKU {\n",
|
||||
"BINDIR ?= /boot/common/bin ;\n",
|
||||
"BINDIR ?= /boot/system/non-packaged/bin ;\n",
|
||||
"CC ?= gcc ;\n",
|
||||
"C++ ?= $(CC) ;\n",
|
||||
"CHMOD ?= chmod ;\n",
|
||||
@@ -104,11 +107,11 @@ const char *jambase[] = {
|
||||
"CHOWN ?= chown ;\n",
|
||||
"FORTRAN ?= \"\" ;\n",
|
||||
"LEX ?= flex ;\n",
|
||||
"LIBDIR ?= /boot/common/lib ;\n",
|
||||
"LIBDIR ?= /boot/system/non-packaged/lib ;\n",
|
||||
"LINK ?= gcc ;\n",
|
||||
"MANDIR ?= /boot/common/man ;\n",
|
||||
"MANDIR ?= /boot/system/non-packaged/documentation/man ;\n",
|
||||
"RANLIB ?= ranlib ;\n",
|
||||
"STDHDRS ?= /boot/develop/headers/posix ;\n",
|
||||
"STDHDRS ?= /boot/system/develop/headers/posix ;\n",
|
||||
"YACC ?= bison -y ;\n",
|
||||
"YACCGEN ?= .c ;\n",
|
||||
"YACCFILES ?= y.tab ;\n",
|
||||
@@ -120,7 +123,7 @@ const char *jambase[] = {
|
||||
"CC ?= gcc ;\n",
|
||||
"CCFLAGS += -D__cygwin__ ;\n",
|
||||
"LEX ?= flex ;\n",
|
||||
"JAMSHELL ?= sh -c ;\n",
|
||||
"JAMSHELL ?= sh -e -c ;\n",
|
||||
"RANLIB ?= \"\" ;\n",
|
||||
"SUFEXE ?= .exe ;\n",
|
||||
"YACC ?= bison -y ;\n",
|
||||
@@ -129,6 +132,7 @@ const char *jambase[] = {
|
||||
"MANDIR ?= /usr/local/share/man ;\n",
|
||||
"case QNX :\n",
|
||||
"AR ?= wlib ;\n",
|
||||
"ARFLAGS ?= ;\n",
|
||||
"CC ?= cc ;\n",
|
||||
"CCFLAGS ?= -Q ; # quiet\n",
|
||||
"C++ ?= $(CC) ;\n",
|
||||
@@ -152,7 +156,8 @@ const char *jambase[] = {
|
||||
"YACCFILES ?= y.tab ;\n",
|
||||
"YACCFLAGS ?= -d ;\n",
|
||||
"}\n",
|
||||
"AR ?= ar ru ;\n",
|
||||
"AR ?= ar ;\n",
|
||||
"ARFLAGS ?= r ;\n",
|
||||
"AS ?= as ;\n",
|
||||
"ASFLAGS ?= ;\n",
|
||||
"AWK ?= awk ;\n",
|
||||
@@ -749,7 +754,7 @@ const char *jambase[] = {
|
||||
"}\n",
|
||||
"actions updated together piecemeal Archive\n",
|
||||
"{\n",
|
||||
"$(AR) $(<) $(>)\n",
|
||||
"$(AR) $(ARFLAGS) $(<) $(>)\n",
|
||||
"}\n",
|
||||
"actions As\n",
|
||||
"{\n",
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
/* Keep JAMVERSYM in sync with VERSION. */
|
||||
/* It can be accessed as $(JAMVERSION) in the Jamfile. */
|
||||
|
||||
#define VERSION "2.5-haiku-20111222"
|
||||
#define JAMVERSYM "JAMVERSION=2.5-haiku-20111222"
|
||||
#define VERSION "2.5-haiku-20211020"
|
||||
#define JAMVERSYM "JAMVERSION=2.5-haiku-20211020"
|
||||
|
||||
Reference in New Issue
Block a user