From 51dc302367154c517724d78f03d61abbe7802a1d Mon Sep 17 00:00:00 2001
From: Puck Meerburg <puck@puckipedia.com>
Date: Wed, 16 Sep 2020 13:14:17 +0000
Subject: [PATCH] jam/Jambase: split AR into ARFLAGS

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>
---
 jam/Jambase | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/jam/Jambase b/jam/Jambase
index 85eb713..be2ffa7 100644
--- a/jam/Jambase
+++ b/jam/Jambase
@@ -135,7 +135,7 @@
 
 # for perforce use -- jambase version
 
-JAMBASEDATE = 2018.11.21 ;
+JAMBASEDATE = 2020.09.16 ;
 
 # Initialize variables
 #
@@ -155,7 +155,8 @@
 	SUFEXE		?= .exe ;
 
 	if $(MSVC) {
-		AR		?= lib /nologo ;
+		AR		?= lib ;
+		ARFLAGS		?= /nologo ;
 		CC		?= cl /nologo ;
 		CCFLAGS		?= /D \"WIN\" ;
 		C++		?= $(CC) ;
@@ -180,6 +181,7 @@
 		local I ; if $(OSPLAT) = IA64 { I = ia64\\ ; } else { I = "" ; }
 
 		AR		?= lib ;
+		ARFLAGS		?= ;
 		AS		?= masm386 ;
 		CC		?= cl /nologo ;
 		CCFLAGS		?= "" ;
@@ -205,7 +207,8 @@
 	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 @@
 
 	case QNX :
 	AR		?= wlib ;
+	ARFLAGS		?= ;
 	CC		?= cc ;
 	CCFLAGS		?= -Q ;	# quiet
 	C++		?= $(CC) ;
@@ -311,7 +315,8 @@
 # General defaults; a lot like UNIX
 #
 
-AR		?= ar ru ;
+AR		?= ar ;
+ARFLAGS		?= ru ;
 AS		?= as ;
 ASFLAGS		?= ;
 AWK		?= awk ;
@@ -1419,7 +1424,7 @@
 
 actions updated together piecemeal Archive
 {
-	$(AR) $(<) $(>)
+	$(AR) $(ARFLAGS) $(<) $(>)
 }
 
 actions As
--
gitore 0.2.3