From f9c00aaee6d94e404ce43bc2003cb239a8308193 Mon Sep 17 00:00:00 2001
From: Edward Diener <eldlistmailingz@tropicsoft.com>
Date: Tue, 14 Apr 2020 09:40:27 -0400
Subject: [PATCH] For gcc use response file under Windows as well as forward
 slash paths.

---
 src/tools/gcc.jam | 36 ++++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/src/tools/gcc.jam b/src/tools/gcc.jam
index 5ceb038fc..a83f8f122 100644
--- a/src/tools/gcc.jam
+++ b/src/tools/gcc.jam
@@ -1100,11 +1100,31 @@ rule link ( targets * : sources * : properties * )
     quote-rpath $(targets) ;
 }
 
+if [ os.name ] in NT
+{
+.nl = "
+" ;
+}
+
+if [ os.name ] in NT
+{
+
+actions link bind LIBRARIES
+{
+    "$(CONFIG_COMMAND)" -L"$(LINKPATH)" -Wl,$(RPATH_OPTION:E=-R)$(SPACE)-Wl,$(RPATH) -Wl,-rpath-link$(SPACE)-Wl,"$(RPATH_LINK)" -o "$(<:WT)" @"@($(<[1]:WT).rsp:E=$(.nl)$(START-GROUP) $(.nl)"$(>:WT)" $(.nl)"$(LIBRARIES)" $(.nl)$(FINDLIBS-ST-PFX) $(.nl)-l$(FINDLIBS-ST) $(.nl)$(FINDLIBS-SA-PFX) $(.nl)-l$(FINDLIBS-SA) $(.nl)$(END-GROUP))" $(OPTIONS) $(USER_OPTIONS)
+}
+
+}
+else
+{
+
 actions link bind LIBRARIES
 {
     "$(CONFIG_COMMAND)" -L"$(LINKPATH)" -Wl,$(RPATH_OPTION:E=-R)$(SPACE)-Wl,$(RPATH) -Wl,-rpath-link$(SPACE)-Wl,"$(RPATH_LINK)" -o "$(<)" $(START-GROUP) "$(>)" "$(LIBRARIES)" $(FINDLIBS-ST-PFX) -l$(FINDLIBS-ST) $(FINDLIBS-SA-PFX) -l$(FINDLIBS-SA) $(END-GROUP) $(OPTIONS) $(USER_OPTIONS)
 }
 
+}
+
 rule link.dll ( targets * : sources * : properties * )
 {
     SPACE on $(targets) = " " ;
@@ -1112,12 +1132,28 @@ rule link.dll ( targets * : sources * : properties * )
     quote-rpath $(targets) ;
 }
 
+if [ os.name ] in NT
+{
+
+# Differs from 'link' above only by -shared.
+actions link.dll bind LIBRARIES
+{
+    "$(CONFIG_COMMAND)" -L"$(LINKPATH)" -Wl,$(RPATH_OPTION:E=-R)$(SPACE)-Wl,$(RPATH) "$(.IMPLIB-COMMAND)$(<[1]:WT)" -o "$(<[-1]:WT)" $(HAVE_SONAME)-Wl,$(SONAME_OPTION)$(SPACE)-Wl,$(<[-1]:D=) -shared @"@($(<[1]:WT).rsp:E=$(.nl)$(START-GROUP) $(.nl)"$(>:WT)" $(.nl)"$(LIBRARIES)" $(.nl)$(FINDLIBS-ST-PFX) $(.nl)-l$(FINDLIBS-ST) $(.nl)$(FINDLIBS-SA-PFX) $(.nl)-l$(FINDLIBS-SA) $(.nl)$(END-GROUP))" $(OPTIONS) $(USER_OPTIONS)
+}
+
+}
+else
+{
+
 # Differs from 'link' above only by -shared.
 actions link.dll bind LIBRARIES
 {
     "$(CONFIG_COMMAND)" -L"$(LINKPATH)" -Wl,$(RPATH_OPTION:E=-R)$(SPACE)-Wl,$(RPATH) "$(.IMPLIB-COMMAND)$(<[1])" -o "$(<[-1])" $(HAVE_SONAME)-Wl,$(SONAME_OPTION)$(SPACE)-Wl,$(<[-1]:D=) -shared $(START-GROUP) "$(>)" "$(LIBRARIES)" $(FINDLIBS-ST-PFX) -l$(FINDLIBS-ST) $(FINDLIBS-SA-PFX) -l$(FINDLIBS-SA) $(END-GROUP) $(OPTIONS) $(USER_OPTIONS)
 }
 
+}
+
+
 ###
 ### Archive library generation.
 ###