From e645f2b562a20b1bee373202b1e7077bef6042ff Mon Sep 17 00:00:00 2001
From: Dave Abrahams <dave@boostpro.com>
Date: Fri, 20 Dec 2002 00:02:26 +0000
Subject: [PATCH] Patch to allow derivation of gcc-STLfilt toolset

[SVN r16667]
---
 gcc-tools.jam    | 5 ++++-
 v1/gcc-tools.jam | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/gcc-tools.jam b/gcc-tools.jam
index 81e3997d9..004864c50 100644
--- a/gcc-tools.jam
+++ b/gcc-tools.jam
@@ -68,6 +68,9 @@ flags gcc CFLAGS <inlining>off : -fno-inline ;
 flags gcc CFLAGS <inlining>on : -Wno-inline ;
 flags gcc CFLAGS <inlining>full : -finline-functions -Wno-inline ;
 
+flags gcc GXX : $(GXX) ;
+flags gcc GCC : $(GCC) ;
+
 #
 # set threading options for various platforms:
 #
@@ -364,7 +367,7 @@ rule C++-action
 
 actions gcc-C++-action
 {
-    $(GCC_BIN_DIR)$(GXX) -c -Wall -ftemplate-depth-100 -U$(UNDEFS) -D$(DEFINES) $(CFLAGS) $(C++FLAGS) -I"$(HDRS)" -I$(SPACE)"$(STDHDRS)" -o "$(<)" "$(>)"
+    $(GXX:R=$(GCC_BIN_DIR)) -c -Wall -ftemplate-depth-100 -U$(UNDEFS) -D$(DEFINES) $(CFLAGS) $(C++FLAGS) -I"$(HDRS)" -I$(SPACE)"$(STDHDRS)" -o "$(<)" "$(>)"
 }
 
 #### Archive ####
diff --git a/v1/gcc-tools.jam b/v1/gcc-tools.jam
index 81e3997d9..004864c50 100644
--- a/v1/gcc-tools.jam
+++ b/v1/gcc-tools.jam
@@ -68,6 +68,9 @@ flags gcc CFLAGS <inlining>off : -fno-inline ;
 flags gcc CFLAGS <inlining>on : -Wno-inline ;
 flags gcc CFLAGS <inlining>full : -finline-functions -Wno-inline ;
 
+flags gcc GXX : $(GXX) ;
+flags gcc GCC : $(GCC) ;
+
 #
 # set threading options for various platforms:
 #
@@ -364,7 +367,7 @@ rule C++-action
 
 actions gcc-C++-action
 {
-    $(GCC_BIN_DIR)$(GXX) -c -Wall -ftemplate-depth-100 -U$(UNDEFS) -D$(DEFINES) $(CFLAGS) $(C++FLAGS) -I"$(HDRS)" -I$(SPACE)"$(STDHDRS)" -o "$(<)" "$(>)"
+    $(GXX:R=$(GCC_BIN_DIR)) -c -Wall -ftemplate-depth-100 -U$(UNDEFS) -D$(DEFINES) $(CFLAGS) $(C++FLAGS) -I"$(HDRS)" -I$(SPACE)"$(STDHDRS)" -o "$(<)" "$(>)"
 }
 
 #### Archive ####