Haiku/buildtools
1
0
Fork 0
mirror of https://review.haiku-os.org/buildtools synced 2024-11-23 07:18:49 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Jambase: Remove RELOCATE.

Browse Source 
We don't need to support these ancient compliers anymore, so this
hack can go away.
This commit is contained in:
Augustin Cavalier 2018-11-21 14:53:20 -05:00
parent 161fe1206c
commit 531869677c
1 changed files with 0 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
jam/Jambase
View File

@ -336,10 +336,6 @@ if $(NT) {
SUFEXE ?= .exe ;
YACC ?= bison -y ;
case DGUX :
RANLIB ?= "" ;
RELOCATE ?= true ;
case HPUX :
RANLIB ?= "" ;
@ -388,10 +384,6 @@ if $(NT) {
NOARSCAN ?= true ;
RANLIB ?= "" ;
case SCO :
RANLIB ?= "" ;
RELOCATE ?= true ;
case SINIX :
RANLIB ?= "" ;
@ -403,11 +395,6 @@ if $(NT) {
NOARSCAN ?= true ;
OPTIM ?= -O0 ;
case UNIXWARE :
RANLIB ?= "" ;
RELOCATE ?= true ;
}
# UNIX defaults
CCFLAGS ?= ;
@ -520,12 +507,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.
# CCHDRS and CCDEFS must be reformatted each time for some
@ -541,10 +522,6 @@ rule C++
{
Depends $(<) : $(>) ;
if $(RELOCATE) {
CcMv $(<) : $(>) ;
}
C++FLAGS on $(<) += $(C++FLAGS) $(SUBDIRC++FLAGS) $(OPTIM) ;
CCHDRS on $(<) = [ on $(<) FIncludes $(HDRS) ] ;
@ -1708,27 +1685,6 @@ actions YaccMv
$(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)) $(<)
}
}
#
# NOARUPDATE - can't update an archive
#