Fix the previous merge commit, it didn't include all the changes.

[SVN r40655]
This commit is contained in:
Daniel James 2007-11-01 18:22:33 +00:00
parent d83bb925d4
commit 52c36c5b95

View File

@ -1776,15 +1776,11 @@
<li>Tests are now run in the context of the user's PATH <li>Tests are now run in the context of the user's PATH
environment settings</li> environment settings</li>
<li><a href= <li>msvc-stlport and intel-win32-stlport
"../tools/build/v1/msvc-stlport-tools.html">msvc-stlport</a>
and <a href=
"../tools/build/v1/intel-win32-tools.html">intel-win32-stlport</a>
toolsets now build static libraries with multithreading toolsets now build static libraries with multithreading
enabled, to be compatible with the STLPort builds.</li> enabled, to be compatible with the STLPort builds.</li>
<li><a href= <li>intel-win32
"../tools/build/v1/intel-win32-tools.html">intel-win32</a>
toolset now handles <code>wchar_t</code> correctly when toolset now handles <code>wchar_t</code> correctly when
intel is installed over msvc6.</li> intel is installed over msvc6.</li>
@ -1804,8 +1800,7 @@
"../libs/conversion/lexical_cast.htm">conversion/lexical_cast</a>'s "../libs/conversion/lexical_cast.htm">conversion/lexical_cast</a>'s
<code>wchar_t</code> fixes from the main trunk.</li> <code>wchar_t</code> fixes from the main trunk.</li>
<li><a href= <li>intel-linux-tools:
"../tools/build/v1/intel-linux-tools.html">intel-linux-tools</a>:
added <code>rt</code> to FINDLIBS in order to make the added <code>rt</code> to FINDLIBS in order to make the
<code>clock_gettime()</code> function available <code>clock_gettime()</code> function available
(backport of a patch in CVS HEAD).</li> (backport of a patch in CVS HEAD).</li>