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
|
||||
{
|
||||
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 ;
|
||||
local os = [ modules.peek : OS ] ;
|
||||
echo $(os) ;
|
||||
if $(os) != "DARWIN"
|
||||
{
|
||||
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. ;
|
||||
}
|
||||
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
|
||||
}
|
||||
@ -243,3 +255,4 @@ lib boost_regex : ../src/$(SOURCES) $(ICU_EXTRA_SOURCE)
|
||||
|
||||
|
||||
|
||||
|
||||
|
Reference in New Issue
Block a user