Merge branch 'version/4.9.2'

ShuangLiu1992 · Aug 22, 2022 · 3f045c3 · 3f045c3
2 parents fc18b65 + 3b86f90
commit 3f045c3
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 2 deletions.
diff --git a/doc/src/history.adoc b/doc/src/history.adoc
@@ -23,6 +23,11 @@ other Jam files.
 * Fix consistent use of `OPT_SEMAPHORE` and documentation of `JAM_SEMAPHORE`.
   -- _Thomas Brown_
 
+== Version 4.9.2
+
+* Fix too long msvc link actions.
+  -- _René Ferdinand Rivera Morell_
+
 == Version 4.9.1
 
 * Fix bad calculation of initial dev-only path to bootstrap file within the
@@ -465,6 +470,14 @@ Thank to all the users that contributed to this release with these changes:
 * Detect difference between MIPS32 and MIPS64 for OS in b2 engine.
   -- _YunQiang Su_
 
+== Version 4.0.1
+
+This patch release fixes a minor issue when trying to configure toolsets that
+override the toolset version with a non-version tag. Currently this is only
+known to be a problem if you: (a) configure a toolset version to something
+like "`tot`" (b) in Boost 1.72.0 when it creates cmake install artifacts.
+Fix for this was provided Peter Dimov.
+
 == Version 4.0.0
 
 After even more years of development the landscape of build systems has changed

diff --git a/src/tools/msvc.jam b/src/tools/msvc.jam
@@ -912,10 +912,16 @@ rule link.dll ( targets + : sources * : properties * )
 # assemblies and Windows native DLLs. The manifests are embedded as resources
 # and are useful in any PE target (both DLL and EXE).
 
+OPT_OUT = "/out:" ;
+OPT_LIBPATH = "/LIBPATH:" ;
+OPT_MANIFESTINPUT = "/MANIFESTINPUT:" ;
+OPT_IMPLIB = "/IMPLIB:" ;
+OPT_DEF = "/def:" ;
+
 {
     actions link bind DEF_FILE LIBRARIES_MENTIONED_BY_FILE MANIFEST_FILE
     {
-        $(.SETUP) $(.LD) @($(<[1]:W).rsp:O=FC:<=@":>=":E="$(>)" $(LIBRARIES_MENTIONED_BY_FILE) $(LIBRARIES) "$(LIBRARY_OPTION)$(FINDLIBS_ST).lib" "$(LIBRARY_OPTION)$(FINDLIBS_SA).lib" $(LINKOPT) $(LINKFLAGS)) /out:"$(<[1]:W)" /LIBPATH:"$(LINKPATH:W)" /MANIFESTINPUT:"$(MANIFEST_FILE)"
+        $(.SETUP) $(.LD) @($(<[1]:W).rsp:O=FC:<=@":>=":E="$(>)" $(LIBRARIES_MENTIONED_BY_FILE) $(LIBRARIES) "$(LIBRARY_OPTION)$(FINDLIBS_ST).lib" "$(LIBRARY_OPTION)$(FINDLIBS_SA).lib" $(LINKOPT) $(LINKFLAGS) $(OPT_OUT)"$(<[1]:W)" $(OPT_LIBPATH)"$(LINKPATH:W)" $(OPT_MANIFESTINPUT)"$(MANIFEST_FILE)")
     }
 
     actions manifest
@@ -930,7 +936,7 @@ rule link.dll ( targets + : sources * : properties * )
 
     actions link.dll bind IMPORT_LIB DEF_FILE LIBRARIES_MENTIONED_BY_FILE MANIFEST_FILE
     {
-        $(.SETUP) $(.LD) @($(<[1]:W).rsp:O=FC:<=@":>=":E="$(>)" $(LIBRARIES_MENTIONED_BY_FILE) $(LIBRARIES) "$(LIBRARY_OPTION)$(FINDLIBS_ST).lib" "$(LIBRARY_OPTION)$(FINDLIBS_SA).lib" $(LINKOPT) $(LINKFLAGS)) /out:"$(<[1]:W)" /LIBPATH:"$(LINKPATH:W)" /MANIFESTINPUT:"$(MANIFEST_FILE)" /DLL /IMPLIB:"$(IMPORT_LIB:W)" /def:"$(DEF_FILE)"
+        $(.SETUP) $(.LD) @($(<[1]:W).rsp:O=FC:<=@":>=":E="$(>)" $(LIBRARIES_MENTIONED_BY_FILE) $(LIBRARIES) "$(LIBRARY_OPTION)$(FINDLIBS_ST).lib" "$(LIBRARY_OPTION)$(FINDLIBS_SA).lib" $(LINKOPT) $(LINKFLAGS) $(OPT_OUT)"$(<[1]:W)" $(OPT_LIBPATH)"$(LINKPATH:W)" $(OPT_MANIFESTINPUT)"$(MANIFEST_FILE)" /DLL $(OPT_IMPLIB)"$(IMPORT_LIB:W)" $(OPT_DEF)"$(DEF_FILE)")
     }
 
     actions manifest.dll