⛏️ index : buildtools.git

author Augustin Cavalier <waddlesplash@gmail.com> 2018-11-21 14:53:20.0 -05:00:00
committer Augustin Cavalier <waddlesplash@gmail.com> 2018-11-21 14:53:20.0 -05:00:00
commit
531869677c2bbc5e1fad81988f789d61743bcb7f [patch]
tree
f3277ad6bc608681e6c7b764bade4a82eb15b571
parent
161fe1206c25e9aeaa2fbb8ff2205362e2975ff0
download
531869677c2bbc5e1fad81988f789d61743bcb7f.tar.gz

Jambase: Remove RELOCATE.

We don't need to support these ancient compliers anymore, so this
hack can go away.

Diff

 jam/Jambase | 44 --------------------------------------------
 1 file changed, 44 deletions(-)

diff --git a/jam/Jambase b/jam/Jambase
index 2c67160..bf5ded4 100644
--- a/jam/Jambase
+++ a/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)) $(<)
	}
}

#