Ticket #6359: icubld.diff

File icubld.diff, 1.8 KB (added by Brian Bassett <bbassett@…>, 11 years ago)

Patch to have intel-win toolset use the correct ICU library names

  • libs/regex/build/Jamfile.v2 

    diff -urN boost_1_48_0.orig/libs/regex/build/Jamfile.v2 boost_1_48_0.intel/libs/regex/build/Jamfile.v2
    old new  
    5050   {
    5151      lib icuuc : :                                           <link>shared <runtime-link>shared <conditional>@path_options ;
    5252      lib icuuc : : <toolset>msvc <variant>debug <name>icuucd <link>shared <runtime-link>shared <conditional>@path_options ;
     53      lib icuuc : : <toolset>intel <variant>debug <name>icuuc <link>shared <runtime-link>shared <conditional>@path_options ;
    5354      lib icuuc : : <name>this_is_an_invalid_library_name ;
    5455
    5556      lib icudt : : <name>icudata               <link>shared <runtime-link>shared <conditional>@path_options ;
    5657      lib icudt : : <name>icudt   <toolset>msvc <link>shared <runtime-link>shared <conditional>@path_options ;
     58      lib icudt : : <name>icudt   <toolset>intel <link>shared <runtime-link>shared <conditional>@path_options ;
    5759      lib icudt : : <name>this_is_an_invalid_library_name ;
    5860
    5961      lib icuin : :                                <name>icui18n <link>shared <runtime-link>shared <conditional>@path_options ;
    6062      lib icuin : : <toolset>msvc <variant>debug   <name>icuind  <link>shared <runtime-link>shared <conditional>@path_options ;
    6163      lib icuin : : <toolset>msvc <variant>release <name>icuin   <link>shared <runtime-link>shared <conditional>@path_options ;
     64      lib icuin : : <toolset>intel <variant>debug   <name>icuin  <link>shared <runtime-link>shared <conditional>@path_options ;
     65      lib icuin : : <toolset>intel <variant>release <name>icuin   <link>shared <runtime-link>shared <conditional>@path_options ;
    6266      lib icuin : : <name>this_is_an_invalid_library_name ;
    6367
    6468      if $(ICU_PATH)