Fix too long msvc link actions.

fixes #175
bfgroup · Jul 4, 2022 · 83ab99b · 83ab99b
1 parent 55dfd8b
commit 83ab99b
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 3 deletions.
diff --git a/doc/src/history.adoc b/doc/src/history.adoc
@@ -1,6 +1,11 @@
 [[b2.history]]
 = History
 
+== 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

diff --git a/src/engine/patchlevel.h b/src/engine/patchlevel.h
@@ -13,4 +13,4 @@ Distributed under the Boost Software License, Version 1.0.
 
 #define VERSION_MAJOR 4
 #define VERSION_MINOR 9
-#define VERSION_PATCH 1
+#define VERSION_PATCH 2
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