From 283daad33ffece00fa3334ff014848b02649653c Mon Sep 17 00:00:00 2001
From: John Maddock <john@johnmaddock.co.uk>
Date: Tue, 11 Nov 2003 12:36:14 +0000
Subject: [PATCH] Second attempt at fixing msvc / Borland lib builds - removed
 piecemeal action.

[SVN r20785]
---
 v1/borland-tools.jam | 3 ++-
 v1/msvc-tools.jam    | 5 +++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/v1/borland-tools.jam b/v1/borland-tools.jam
index a58739002..54d89bd74 100644
--- a/v1/borland-tools.jam
+++ b/v1/borland-tools.jam
@@ -177,7 +177,7 @@ rule Archive-action
     borland-Archive-action $(<) : $(>) ;
 }
 
-actions updated together piecemeal borland-Archive-action
+actions borland-Archive-action
 {
     IF EXIST "$(<)" DEL "$(<)"
     "$(BCC_TOOL_PATH)tlib" /P64 /u /a /C /$(ARFLAGS) "$(<)" +"$(>)"
@@ -189,3 +189,4 @@ actions updated together piecemeal borland-Archive-action
 
 
 
+
diff --git a/v1/msvc-tools.jam b/v1/msvc-tools.jam
index 8dd3394db..9c3af8060 100644
--- a/v1/msvc-tools.jam
+++ b/v1/msvc-tools.jam
@@ -185,10 +185,11 @@ rule Archive-action
     with-command-file vc-Archive $(<) : $(>) ;
 }
 
-actions updated together piecemeal vc-Archive
+actions vc-Archive
 {
     $(VC_SETUP)
     if exist "$(<)" DEL "$(<)"
-    "$(VC_TOOL_PATH)$(VC_LINKER)" /lib $(ARFLAGS) $(PDB_LINKFLAG)"$(VC_PDB_FILE)" /out:"$(<)" %_$(<:B)_% @"$(>)"
+    "$(VC_TOOL_PATH)$(VC_LINKER)" /lib $(ARFLAGS) $(PDB_LINKFLAG)"$(VC_PDB_FILE)" /out:"$(<)" @"$(>)"
 }
 
+