From 531869677c2bbc5e1fad81988f789d61743bcb7f Mon Sep 17 00:00:00 2001 From: Augustin Cavalier Date: Wed, 21 Nov 2018 14:53:20 -0500 Subject: [PATCH] Jambase: Remove RELOCATE. We don't need to support these ancient compliers anymore, so this hack can go away. --- jam/Jambase | 44 -------------------------------------------- 1 file changed, 44 deletions(-) diff --git a/jam/Jambase b/jam/Jambase index 2c67160..bf5ded4 100644 --- a/jam/Jambase +++ b/jam/Jambase @@ -336,10 +336,6 @@ SUFEXE ?= .exe ; YACC ?= bison -y ; - case DGUX : - RANLIB ?= "" ; - RELOCATE ?= true ; - case HPUX : RANLIB ?= "" ; @@ -386,11 +382,7 @@ LINK ?= $(CC) ; LINKFLAGS ?= -Q ; # quiet NOARSCAN ?= true ; - RANLIB ?= "" ; - - case SCO : RANLIB ?= "" ; - RELOCATE ?= true ; case SINIX : RANLIB ?= "" ; @@ -402,11 +394,6 @@ case UNICOS : NOARSCAN ?= true ; OPTIM ?= -O0 ; - - case UNIXWARE : - RANLIB ?= "" ; - RELOCATE ?= true ; - } # UNIX defaults @@ -519,12 +506,6 @@ rule Cc { Depends $(<) : $(>) ; - - # If the compiler's -o flag doesn't work, relocate the .o - - if $(RELOCATE) { - CcMv $(<) : $(>) ; - } # Just to clarify here: this sets the per-target CCFLAGS to # be the current value of (global) CCFLAGS and SUBDIRCCFLAGS. @@ -540,10 +521,6 @@ rule C++ { Depends $(<) : $(>) ; - - if $(RELOCATE) { - CcMv $(<) : $(>) ; - } C++FLAGS on $(<) += $(C++FLAGS) $(SUBDIRC++FLAGS) $(OPTIM) ; @@ -1706,27 +1683,6 @@ { $(MV) $(YACCFILES).c $(<[1]) $(MV) $(YACCFILES).h $(<[2]) -} - -# -# RELOCATE - for compilers with broken -o flags -# - -if $(RELOCATE) { - actions C++ - { - $(C++) -c $(C++FLAGS) $(CCDEFS) $(CCHDRS) $(>) - } - - actions Cc - { - $(CC) -c $(CCFLAGS) $(CCDEFS) $(CCHDRS) $(>) - } - - actions ignore CcMv - { - [ $(<) != $(>:BS=$(SUFOBJ)) ] && $(MV) $(>:BS=$(SUFOBJ)) $(<) - } } # -- gitore 0.2.3