forked from boostorg/regex
Updates to build system: Sun and SGI compilers have a problem doing a shared link, and some platforms don't have an icudata library.
[SVN r40128]
This commit is contained in:
@ -125,12 +125,24 @@ rule check-icu-config ( )
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
ECHO WARNING: ICU shared data library not found in path. ;
|
local os = [ modules.peek : OS ] ;
|
||||||
ECHO HINT: If the regex library fails to link then try again ;
|
echo $(os) ;
|
||||||
ECHO with the environment variable ICU_LINK set to contain ;
|
if $(os) != "DARWIN"
|
||||||
ECHO the linker options required to link to ICU. ;
|
{
|
||||||
ECHO Defaulting to look for libicudata ... ;
|
ECHO WARNING: ICU shared data library not found in path. ;
|
||||||
gICU_DATA_LIB = icudata ;
|
ECHO HINT: If the regex library fails to link then try again ;
|
||||||
|
ECHO with the environment variable ICU_LINK set to contain ;
|
||||||
|
ECHO the linker options required to link to ICU. ;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
ECHO WARNING: ICU shared data library not found in path. ;
|
||||||
|
ECHO HINT: If the regex library fails to link then try again ;
|
||||||
|
ECHO with the environment variable ICU_LINK set to contain ;
|
||||||
|
ECHO the linker options required to link to ICU. ;
|
||||||
|
ECHO Defaulting to look for libicudata ... ;
|
||||||
|
gICU_DATA_LIB = icudata ;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
#End of addition by Tommy Nordgren
|
#End of addition by Tommy Nordgren
|
||||||
}
|
}
|
||||||
@ -243,3 +255,4 @@ lib boost_regex : ../src/$(SOURCES) $(ICU_EXTRA_SOURCE)
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
@ -4,7 +4,12 @@
|
|||||||
# http://www.boost.org/LICENSE_1_0.txt.
|
# http://www.boost.org/LICENSE_1_0.txt.
|
||||||
|
|
||||||
project
|
project
|
||||||
: requirements <threading>multi <link>shared:<define>BOOST_REGEX_DYN_LINK=1
|
: requirements
|
||||||
|
<threading>multi
|
||||||
|
<link>shared:<define>BOOST_REGEX_DYN_LINK=1
|
||||||
|
# There are unidentified linker problems on these platforms:
|
||||||
|
<toolset>mipspro-7.4:<link>static
|
||||||
|
<toolset>sun-5.9:<link>static
|
||||||
;
|
;
|
||||||
|
|
||||||
|
|
||||||
@ -65,3 +70,4 @@ test-suite regex-examples :
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
@ -4,7 +4,14 @@
|
|||||||
# http://www.boost.org/LICENSE_1_0.txt.
|
# http://www.boost.org/LICENSE_1_0.txt.
|
||||||
|
|
||||||
project
|
project
|
||||||
: requirements <threading>multi <link>shared:<define>BOOST_REGEX_DYN_LINK=1 <toolset>msvc-7.1:<define>TEST_MFC=1 <toolset>msvc-7.0:<define>TEST_MFC=1
|
: requirements
|
||||||
|
<threading>multi
|
||||||
|
<link>shared:<define>BOOST_REGEX_DYN_LINK=1
|
||||||
|
<toolset>msvc-7.1:<define>TEST_MFC=1
|
||||||
|
<toolset>msvc-7.0:<define>TEST_MFC=1
|
||||||
|
# There are unidentified linker problems on these platforms:
|
||||||
|
<toolset>mipspro-7.4:<link>static
|
||||||
|
<toolset>sun-5.9:<link>static
|
||||||
;
|
;
|
||||||
|
|
||||||
#
|
#
|
||||||
@ -136,3 +143,4 @@ test-suite regex
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user