Boost logo

Boost-Commit :

From: technews_at_[hidden]
Date: 2008-01-11 14:09:58


Author: turkanis
Date: 2008-01-11 14:09:58 EST (Fri, 11 Jan 2008)
New Revision: 42683
URL: http://svn.boost.org/trac/boost/changeset/42683

Log:
another attempt to fix linking for compression tests on intel-darwin
Text files modified:
   branches/iostreams_dev/libs/iostreams/test/Jamfile.v2 | 16 +++++++++++-----
   1 files changed, 11 insertions(+), 5 deletions(-)

Modified: branches/iostreams_dev/libs/iostreams/test/Jamfile.v2
==============================================================================
--- branches/iostreams_dev/libs/iostreams/test/Jamfile.v2 (original)
+++ branches/iostreams_dev/libs/iostreams/test/Jamfile.v2 2008-01-11 14:09:58 EST (Fri, 11 Jan 2008)
@@ -26,7 +26,6 @@
                 <toolset>msvc:<define>_SCL_SECURE_NO_DEPRECATE
                 <toolset>msvc,<stdlib>stlport:<runtime-link>static
                 <toolset>cw-9.3,<os>darwin:<runtime-link>static
- <toolset>intel,<os>darwin:<runtime-link>static
                 <define>BOOST_IOSTREAMS_NO_LIB
                 <link>shared:<define>BOOST_IOSTREAMS_DYN_LINK=1
                 $(requirements)
@@ -102,16 +101,23 @@
       }
       if ! $(NO_BZIP2)
       {
- all-tests += [ test-iostreams
- bzip2_test.cpp ../build//boost_iostreams ] ;
+ all-tests +=
+ [ test-iostreams
+ bzip2_test.cpp
+ ../build//boost_iostreams
+ : <toolset>intel,<os>darwin:<link>static ] ;
       }
       if ! $(NO_ZLIB)
       {
           all-tests +=
               [ test-iostreams
- gzip_test.cpp ../build//boost_iostreams ]
+ gzip_test.cpp
+ ../build//boost_iostreams
+ : <toolset>intel,<os>darwin:<link>static ]
               [ test-iostreams
- zlib_test.cpp ../build//boost_iostreams ] ;
+ zlib_test.cpp
+ ../build//boost_iostreams
+ : <toolset>intel,<os>darwin:<link>static ] ;
       }
           
     test-suite "iostreams" : $(all-tests) ;


Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk