mirror of
https://review.haiku-os.org/buildtools
synced 2024-11-23 07:18:49 +01:00
jam: update default paths in Jambase
Running "./jam0 install" installed jam in /boot/common/bin/ which is no longer used. Other directories also looked outdated so they are updated too. Test plan: 1. make 2. ./jam0 install Install /boot/system/non-packaged/bin/jam 3. which jam /boot/system/non-packaged/bin/jam Change-Id: I69c719eab0bd211f545c17337e3bc73bb1ab78fe Reviewed-on: https://review.haiku-os.org/c/buildtools/+/4617 Reviewed-by: waddlesplash <waddlesplash@gmail.com>
This commit is contained in:
parent
4b7b6c63e8
commit
72c791bc1f
10
jam/Jambase
10
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 ;
|
||||
|
@ -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",
|
||||
@ -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 r ;\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",
|
||||
|
Loading…
Reference in New Issue
Block a user