mirror of
https://github.com/boostorg/build.git
synced 2026-02-21 02:52:12 +00:00
Attempt to unbreak <library-file>
[SVN r43147]
This commit is contained in:
@@ -866,7 +866,7 @@ else
|
||||
|
||||
if [ os.name ] in NT
|
||||
{
|
||||
actions link bind DEF_FILE
|
||||
actions link bind DEF_FILE LIBRARIES_MENTIONED_BY_FILE
|
||||
{
|
||||
$(.LD) $(LINKFLAGS) /out:"$(<[1]:W)" /LIBPATH:"$(LINKPATH:W)" $(OPTIONS) @"@($(<[1]:W).rsp:E=$(nl)"$(>)" $(nl)$(LIBRARIES_MENTIONED_BY_FILE) $(nl)$(LIBRARIES) $(nl)"$(LIBRARY_OPTION)$(FINDLIBS_ST).lib" $(nl)"$(LIBRARY_OPTION)$(FINDLIBS_SA).lib")"
|
||||
if %ERRORLEVEL% NEQ 0 EXIT %ERRORLEVEL%
|
||||
@@ -875,7 +875,7 @@ if [ os.name ] in NT
|
||||
)
|
||||
}
|
||||
|
||||
actions link.dll bind DEF_FILE
|
||||
actions link.dll bind DEF_FILE LIBRARIES_MENTIONED_BY_FILE
|
||||
{
|
||||
$(.LD) /DLL $(LINKFLAGS) /out:"$(<[1]:W)" /IMPLIB:"$(<[2]:W)" /LIBPATH:"$(LINKPATH:W)" /def:"$(DEF_FILE)" $(OPTIONS) @"@($(<[1]:W).rsp:E=$(nl)"$(>)" $(nl)$(LIBRARIES_MENTIONED_BY_FILE) $(nl)$(LIBRARIES) $(nl)"$(LIBRARY_OPTION)$(FINDLIBS_ST).lib" $(nl)"$(LIBRARY_OPTION)$(FINDLIBS_SA).lib")"
|
||||
if %ERRORLEVEL% NEQ 0 EXIT %ERRORLEVEL%
|
||||
@@ -886,7 +886,7 @@ if [ os.name ] in NT
|
||||
}
|
||||
else
|
||||
{
|
||||
actions link bind DEF_FILE
|
||||
actions link bind DEF_FILE LIBRARIES_MENTIONED_BY_FILE
|
||||
{
|
||||
$(.LD) $(LINKFLAGS) /out:"$(<[1]:W)" /LIBPATH:"$(LINKPATH:W)" $(OPTIONS) @"@($(<[1]:W).rsp:E=$(nl)"$(>)" $(nl)$(LIBRARIES_MENTIONED_BY_FILE) $(nl)$(LIBRARIES) $(nl)"$(LIBRARY_OPTION)$(FINDLIBS_ST).lib" $(nl)"$(LIBRARY_OPTION)$(FINDLIBS_SA).lib")"
|
||||
if test -e "$(<[1]).manifest"; then
|
||||
@@ -894,7 +894,7 @@ else
|
||||
fi
|
||||
}
|
||||
|
||||
actions link.dll bind DEF_FILE
|
||||
actions link.dll bind DEF_FILE LIBRARIES_MENTIONED_BY_FILE
|
||||
{
|
||||
$(.LD) /DLL $(LINKFLAGS) /out:"$(<[1]:W)" /IMPLIB:"$(<[2]:W)" /LIBPATH:"$(LINKPATH:W)" /def:"$(DEF_FILE)" $(OPTIONS) @"@($(<[1]:W).rsp:E=$(nl)"$(>)" $(nl)$(LIBRARIES_MENTIONED_BY_FILE) $(nl)$(LIBRARIES) $(nl)"$(LIBRARY_OPTION)$(FINDLIBS_ST).lib" $(nl)"$(LIBRARY_OPTION)$(FINDLIBS_SA).lib")"
|
||||
if test -e "$(<[1]).manifest"; then
|
||||
|
||||
Reference in New Issue
Block a user