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

jam/Jambase: split AR into ARFLAGS

Browse Source 
This brings Jam's usage of AR to be more conventional: the flags for AR
are moved to a separate variable, called ARFLAGS, ensuring that any
environment that overrides the AR variable will still end up using the
correct flags to create the archve.

Change-Id: I00449b284fab132d5fc9239017d742480fb51820
Reviewed-on: https://review.haiku-os.org/c/buildtools/+/3226
Reviewed-by: Adrien Destugues <pulkomandy@gmail.com>
This commit is contained in:
Puck Meerburg 2020-09-16 13:14:17 +00:00 committed by Adrien Destugues
parent 0af6003997
commit 51dc302367
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
jam/Jambase
View File

@ -135,7 +135,7 @@
# for perforce use -- jambase version
JAMBASEDATE = 2018.11.21 ;
JAMBASEDATE = 2020.09.16 ;
# Initialize variables
#
@ -155,7 +155,8 @@ if $(NT) {
SUFEXE ?= .exe ;
if $(MSVC) {
AR ?= lib /nologo ;
AR ?= lib ;
ARFLAGS ?= /nologo ;
CC ?= cl /nologo ;
CCFLAGS ?= /D \"WIN\" ;
C++ ?= $(CC) ;
@ -180,6 +181,7 @@ if $(NT) {
local I ; if $(OSPLAT) = IA64 { I = ia64\\ ; } else { I = "" ; }
AR ?= lib ;
ARFLAGS ?= ;
AS ?= masm386 ;
CC ?= cl /nologo ;
CCFLAGS ?= "" ;
@ -205,7 +207,8 @@ if $(NT) {
RANLIB ?= "ranlib" ;
SUFEXE ?= .exe ;
} else if $(OS) = BEOS && $(OSPLAT) = PPC {
AR ?= mwld -xml -o ;
AR ?= mwld ;
ARFLAGS ?= -xml -o ;
BINDIR ?= /boot/home/config/bin ;
CC ?= mwcc ;
CCFLAGS ?= -nosyspath ;
@ -280,6 +283,7 @@ if $(NT) {
case QNX :
AR ?= wlib ;
ARFLAGS ?= ;
CC ?= cc ;
CCFLAGS ?= -Q ; # quiet
C++ ?= $(CC) ;
@ -311,7 +315,8 @@ if $(NT) {
# General defaults; a lot like UNIX
#
AR ?= ar ru ;
AR ?= ar ;
ARFLAGS ?= ru ;
AS ?= as ;
ASFLAGS ?= ;
AWK ?= awk ;
@ -1419,7 +1424,7 @@ if $(NT) {
actions updated together piecemeal Archive
{
$(AR) $(<) $(>)
$(AR) $(ARFLAGS) $(<) $(>)
}
actions As