Changeset 66699


Ignore:
Timestamp:
Nov 23, 2010, 1:09:08 PM (7 years ago)
Author:
John Maddock
Message:

Yes another attempt to fix the 64-bit paths issue.
Refs #4864.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/libs/regex/build/Jamfile.v2

    r66659 r66699  
    1313local disable-icu = [ MATCH (--disable-icu) : [ modules.peek : ARGV ] ] ;
    1414
    15 rule dll-path_options ( properties * )
     15rule path_options ( properties * )
    1616{
    1717    local result ;
    1818    if <address-model>64 in $(properties)
    1919    {
    20         result = <dll-path>$(ICU_PATH)/bin64 ;
     20        result = <search>$(ICU_PATH)/bin64 <search>$(ICU_PATH)/lib64 ;
    2121    }
    2222    else
    2323    {
    24         result = <dll-path>$(ICU_PATH)/bin ;
     24        result = <search>$(ICU_PATH)/bin <search>$(ICU_PATH)/lib ;
    2525    }
    26     ECHO $(result) ;
    2726    return $(result) ;
    2827}
     
    5049   else
    5150   {
    52       lib icuuc : :                   <search>$(ICU_PATH)/lib   <link>shared <runtime-link>shared <dll-path>$(ICU_PATH)/bin ;
    53       lib icuuc : : <address-model>64 <search>$(ICU_PATH)/lib64 <link>shared <runtime-link>shared <dll-path>$(ICU_PATH)/bin64 ;
    54       lib icuuc : :                   <toolset>msvc <variant>debug <name>icuucd <search>$(ICU_PATH)/lib   <link>shared <runtime-link>shared <dll-path>$(ICU_PATH)/bin ;
    55       lib icuuc : : <address-model>64 <toolset>msvc <variant>debug <name>icuucd <search>$(ICU_PATH)/lib64 <link>shared <runtime-link>shared <dll-path>$(ICU_PATH)/bin64 ;
     51      lib icuuc : :                                           <link>shared <runtime-link>shared <conditional>@path_options ;
     52      lib icuuc : : <toolset>msvc <variant>debug <name>icuucd <link>shared <runtime-link>shared <conditional>@path_options ;
    5653      lib icuuc : : <name>this_is_an_invalid_library_name ;
    5754
    58       lib icudt : :                   <search>$(ICU_PATH)/lib   <name>icudata <link>shared <runtime-link>shared <dll-path>$(ICU_PATH)/bin ;
    59       lib icudt : : <address-model>64 <search>$(ICU_PATH)/lib64 <name>icudata <link>shared <runtime-link>shared <dll-path>$(ICU_PATH)/bin64 ;
    60       lib icudt : :                   <search>$(ICU_PATH)/lib   <name>icudt <toolset>msvc <link>shared <runtime-link>shared <dll-path>$(ICU_PATH)/bin ;
    61       lib icudt : : <address-model>64 <search>$(ICU_PATH)/lib64 <name>icudt <toolset>msvc <link>shared <runtime-link>shared <dll-path>$(ICU_PATH)/bin64 ;
     55      lib icudt : : <name>icudata               <link>shared <runtime-link>shared <conditional>@path_options ;
     56      lib icudt : : <name>icudt   <toolset>msvc <link>shared <runtime-link>shared <conditional>@path_options ;
    6257      lib icudt : : <name>this_is_an_invalid_library_name ;
    6358
    64       lib icuin : :                   <search>$(ICU_PATH)/lib   <name>icui18n <link>shared <runtime-link>shared <dll-path>$(ICU_PATH)/bin ;
    65       lib icuin : : <address-model>64 <search>$(ICU_PATH)/lib64 <name>icui18n <link>shared <runtime-link>shared <dll-path>$(ICU_PATH)/bin64 ;
    66       lib icuin : :                   <toolset>msvc <variant>debug <name>icuind <search>$(ICU_PATH)/lib <link>shared <runtime-link>shared <dll-path>$(ICU_PATH)/bin ;
    67       lib icuin : : <address-model>64 <toolset>msvc <variant>debug <name>icuind <search>$(ICU_PATH)/lib64 <link>shared <runtime-link>shared <dll-path>$(ICU_PATH)/bin64 ;
    68       lib icuin : :                   <toolset>msvc <variant>release <name>icuin <search>$(ICU_PATH)/lib <link>shared <runtime-link>shared <dll-path>$(ICU_PATH)/bin ;
    69       lib icuin : : <address-model>64 <toolset>msvc <variant>release <name>icuin <search>$(ICU_PATH)/lib64 <link>shared <runtime-link>shared <dll-path>$(ICU_PATH)/bin64 ;
     59      lib icuin : :                                <name>icui18n <link>shared <runtime-link>shared <conditional>@path_options ;
     60      lib icuin : : <toolset>msvc <variant>debug   <name>icuind  <link>shared <runtime-link>shared <conditional>@path_options ;
     61      lib icuin : : <toolset>msvc <variant>release <name>icuin   <link>shared <runtime-link>shared <conditional>@path_options ;
    7062      lib icuin : : <name>this_is_an_invalid_library_name ;
    7163
     
    10799         <library>icuin/<link>shared/<runtime-link>shared
    108100         <define>BOOST_HAS_ICU=1
    109          <dll-path>$(ICU_PATH)/bin
    110101         <runtime-link>shared
    111102         <toolset>msvc:<linkflags>/delayload:$(icuucd_name:B).dll
Note: See TracChangeset for help on using the changeset viewer.