diff --git a/src/tools/jam/Jambase b/src/tools/jam/Jambase index 4a8b94e0ef..b65642ab92 100644 --- a/src/tools/jam/Jambase +++ b/src/tools/jam/Jambase @@ -366,7 +366,7 @@ else if $(MAC) SUFLIB ?= .lib ; SUFOBJ ?= .o ; } -else if $(OS) = BEOS && $(METROWERKS) +else if $(OS) = BEOS && $(OSPLAT) = PPC { AR ?= mwld -xml -o ; BINDIR ?= /boot/home/config/bin ; diff --git a/src/tools/jam/Makefile b/src/tools/jam/Makefile index 0a66be2fe6..6aa3d20a32 100644 --- a/src/tools/jam/Makefile +++ b/src/tools/jam/Makefile @@ -29,15 +29,6 @@ CFLAGS = #CFLAGS = -DNT #TARGET = /Fejam0 -# BeOS - Metroworks CodeWarrior -#CC = mwcc -#Include = /NewDisk/develop/headers/posix -#CFLAGS = -I $(Include) - -# BeOS - gcc -#CC = gcc -#LINKLIBS = -lnet - # Interix - gcc #CC = gcc diff --git a/src/tools/jam/jam.h b/src/tools/jam/jam.h index 86be7a5015..d309b67d6e 100644 --- a/src/tools/jam/jam.h +++ b/src/tools/jam/jam.h @@ -393,6 +393,7 @@ defined( PPC ) || \ defined( ppc ) || \ defined( __powerpc__ ) || \ + defined( __POWERPC__ ) || \ defined( __ppc__ ) # define OSPLAT "OSPLAT=PPC" # endif diff --git a/src/tools/jam/jambase.c b/src/tools/jam/jambase.c index 4f8e0efc27..d036048ca7 100644 --- a/src/tools/jam/jambase.c +++ b/src/tools/jam/jambase.c @@ -185,7 +185,7 @@ char *jambase[] = { "SUFLIB ?= .lib ;\n", "SUFOBJ ?= .o ;\n", "}\n", -"else if $(OS) = BEOS && $(METROWERKS)\n", +"else if $(OS) = BEOS && $(OSPLAT) = PPC\n", "{\n", "AR ?= mwld -xml -o ;\n", "BINDIR ?= /boot/home/config/bin ;\n",