From 772baf808b8798d970d470244ad184dbb993dbe0 Mon Sep 17 00:00:00 2001
From: Vladimir Prus <ghost@cs.msu.su>
Date: Tue, 1 Jul 2003 14:10:56 +0000
Subject: [PATCH] Add linkflags and archiveflags support to borland toolset.

[SVN r18908]
---
 new/builtin.jam      |  1 +
 tools/borland.jam    | 10 ++++++----
 v2/tools/borland.jam | 10 ++++++----
 v2/tools/builtin.jam |  1 +
 4 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/new/builtin.jam b/new/builtin.jam
index b72c7d1c0..bd2c0ad6f 100644
--- a/new/builtin.jam
+++ b/new/builtin.jam
@@ -49,6 +49,7 @@ feature "include" : : free path ;
 feature cflags : : free ;
 feature cxxflags : : free ;
 feature linkflags : : free ;
+feature archiveflags : : free ;
 feature version : : free ;
 
 feature dependency : : free dependency ;
diff --git a/tools/borland.jam b/tools/borland.jam
index 329e415bf..6f802652e 100644
--- a/tools/borland.jam
+++ b/tools/borland.jam
@@ -114,8 +114,6 @@ flags borland.compile OPTIONS <cxxflags> ;
 flags borland.compile DEFINES <define> ;
 flags borland.compile INCLUDES <include> ;
 
-flags borland.link OPTIONS <link>shared : -tWD ;
-
 flags borland NEED_IMPLIB <main-target-type>LIB/<link>shared : "" ;
 
 #
@@ -158,6 +156,9 @@ toolset.flags borland.link FINDLIBS-SA <find-shared-library> ;
 toolset.flags borland.link LIBRARIES <library-file> ;
 toolset.flags borland.link LIBRARIES <library> ;
 
+flags borland.link OPTIONS <linkflags> ;
+flags borland.link OPTIONS <link>shared : -tWD ;
+
 flags builtin.response-file LIBRARY_PATH_OPTION <toolset>borland : -L : unchecked ;
 flags builtin.response-file LIBRARY_OPTION <toolset>borland : "" : unchecked ;
 
@@ -168,12 +169,13 @@ flags builtin.response-file LIBRARY_OPTION <toolset>borland : "" : unchecked ;
 # $(BCC_TOOL_PATH) to the path
 # The NEED_IMPLIB variable controls whether we need to invoke implib.
 
+flags borland.archive AROPTIONS <archiveflags> ;
 # Declare action for archives. We don't use response file
 # since it's hard to get "+-" there.
 # CONSIDER: don't know what 'together' is for...
 actions updated together piecemeal archive
 { 
-    "$(.root)tlib" /P256 /u /a /C "$(<:W)" +-"$(>:W)"
+    "$(.root)tlib" $(AROPTIONS) /u /a /C "$(<:W)" +-"$(>:W)"
 }
 
 
@@ -197,7 +199,7 @@ if [ os.name ] = CYGWIN
     # options.
     actions updated together piecemeal archive
     { 
-        echo "\"$(.root)tlib\" /P256 /u /a /C \"$(<:W)\" +-\"$(>:W)\"" > $(<:D)/tlib.bat
+        echo "\"$(.root)tlib\" $(OPTIONS) /u /a /C \"$(<:W)\" +-\"$(>:W)\"" > $(<:D)/tlib.bat
         chmod +x $(<:D)/tlib.bat && $(<:D)/tlib.bat && rm $(<:D)/tlib.bat ;
     }
 }
diff --git a/v2/tools/borland.jam b/v2/tools/borland.jam
index 329e415bf..6f802652e 100644
--- a/v2/tools/borland.jam
+++ b/v2/tools/borland.jam
@@ -114,8 +114,6 @@ flags borland.compile OPTIONS <cxxflags> ;
 flags borland.compile DEFINES <define> ;
 flags borland.compile INCLUDES <include> ;
 
-flags borland.link OPTIONS <link>shared : -tWD ;
-
 flags borland NEED_IMPLIB <main-target-type>LIB/<link>shared : "" ;
 
 #
@@ -158,6 +156,9 @@ toolset.flags borland.link FINDLIBS-SA <find-shared-library> ;
 toolset.flags borland.link LIBRARIES <library-file> ;
 toolset.flags borland.link LIBRARIES <library> ;
 
+flags borland.link OPTIONS <linkflags> ;
+flags borland.link OPTIONS <link>shared : -tWD ;
+
 flags builtin.response-file LIBRARY_PATH_OPTION <toolset>borland : -L : unchecked ;
 flags builtin.response-file LIBRARY_OPTION <toolset>borland : "" : unchecked ;
 
@@ -168,12 +169,13 @@ flags builtin.response-file LIBRARY_OPTION <toolset>borland : "" : unchecked ;
 # $(BCC_TOOL_PATH) to the path
 # The NEED_IMPLIB variable controls whether we need to invoke implib.
 
+flags borland.archive AROPTIONS <archiveflags> ;
 # Declare action for archives. We don't use response file
 # since it's hard to get "+-" there.
 # CONSIDER: don't know what 'together' is for...
 actions updated together piecemeal archive
 { 
-    "$(.root)tlib" /P256 /u /a /C "$(<:W)" +-"$(>:W)"
+    "$(.root)tlib" $(AROPTIONS) /u /a /C "$(<:W)" +-"$(>:W)"
 }
 
 
@@ -197,7 +199,7 @@ if [ os.name ] = CYGWIN
     # options.
     actions updated together piecemeal archive
     { 
-        echo "\"$(.root)tlib\" /P256 /u /a /C \"$(<:W)\" +-\"$(>:W)\"" > $(<:D)/tlib.bat
+        echo "\"$(.root)tlib\" $(OPTIONS) /u /a /C \"$(<:W)\" +-\"$(>:W)\"" > $(<:D)/tlib.bat
         chmod +x $(<:D)/tlib.bat && $(<:D)/tlib.bat && rm $(<:D)/tlib.bat ;
     }
 }
diff --git a/v2/tools/builtin.jam b/v2/tools/builtin.jam
index b72c7d1c0..bd2c0ad6f 100644
--- a/v2/tools/builtin.jam
+++ b/v2/tools/builtin.jam
@@ -49,6 +49,7 @@ feature "include" : : free path ;
 feature cflags : : free ;
 feature cxxflags : : free ;
 feature linkflags : : free ;
+feature archiveflags : : free ;
 feature version : : free ;
 
 feature dependency : : free dependency ;